File abiword-2.8.6-pthread.patch of Package mingw32-abiword

Overview Repositories Revisions Requests Users Attributes Meta

File abiword-2.8.6-pthread.patch of Package mingw32-abiword (Revision 03420294e10bd59e21463085cf190547)

Currently displaying revision 03420294e10bd59e21463085cf190547 , Show latest

diff -urEbwB abiword-2.8.6/plugin-configure.m4 abiword-2.8.6/plugin-configure.m4
--- abiword-2.8.6/plugin-configure.m4	2010-06-13 23:17:27.000000000 +0200
+++ abiword-2.8.6/plugin-configure.m4	2011-11-17 00:46:08.806860001 +0100
@@ -706,7 +706,7 @@
 
 if test "$enable_collab_backend_tcp" = "yes" || \
    test "$enable_collab_backend_service" = "yes"; then
-	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread"
+	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt"
 fi
 
 test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab"
diff -urEbwB abiword-2.8.6/plugins/collab/core/sync/xp/lock.h abiword-2.8.6/plugins/collab/core/sync/xp/lock.h
--- abiword-2.8.6/plugins/collab/core/sync/xp/lock.h	2009-04-28 12:42:32.000000000 +0200
+++ abiword-2.8.6/plugins/collab/core/sync/xp/lock.h	2011-11-17 02:25:23.478134000 +0100
@@ -19,7 +19,7 @@
 #ifndef __ABICOLLAB_LOCK__
 #define __ABICOLLAB_LOCK__
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <pthread.h>
 #endif
 
@@ -35,7 +35,7 @@
 public:
 	mutex()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		repr = CreateMutex(0, FALSE, 0);
 #else
 		pthread_mutex_init(&repr, NULL);
@@ -44,7 +44,7 @@
 
 	~mutex()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		CloseHandle(repr);
 #else
 		pthread_mutex_destroy(&repr);
@@ -56,7 +56,7 @@
 	mutex( const mutex& );
 	const mutex& operator=( const mutex& );
 
-#ifdef WIN32
+#ifdef _WIN32
 	HANDLE repr;
 #else
 	pthread_mutex_t repr;
@@ -69,7 +69,7 @@
 	scoped_lock(mutex& mutex)
 		: m_mutex(mutex)
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		WaitForSingleObject(m_mutex.repr, INFINITE);
 #else
 		pthread_mutex_lock(&m_mutex.repr);
@@ -78,7 +78,7 @@
 
 	~scoped_lock()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		ReleaseMutex(m_mutex.repr);
 #else
 		pthread_mutex_unlock(&m_mutex.repr);
diff -urEbwB abiword-2.8.6/plugins/collab/plugin.m4 abiword-2.8.6/plugins/collab/plugin.m4
--- abiword-2.8.6/plugins/collab/plugin.m4	2010-05-30 20:37:29.000000000 +0200
+++ abiword-2.8.6/plugins/collab/plugin.m4	2011-11-17 02:26:15.702133982 +0100
@@ -171,7 +171,7 @@
 
 if test "$enable_collab_backend_tcp" = "yes" || \
    test "$enable_collab_backend_service" = "yes"; then
-	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread"
+	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt"
 fi
 
 test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab"

Places

File abiword-2.8.6-pthread.patch of Package mingw32-abiword (Revision 03420294e10bd59e21463085cf190547)

Places