[Opensync-commits] r5184 - in trunk: . opensync/client

[<dg...@su...>]

Author: bricks
Date: Sun Jan 18 14:10:53 2009
New Revision: 5184
URL: http://www.opensync.org/changeset/5184

Log:
workaround for ticket #1044
prevent call to client_proxy_shutdown on mac os x

Modified:
   trunk/CMakeLists.txt
   trunk/config.h.cmake
   trunk/opensync/client/opensync_client_proxy.c

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt	Sun Jan 18 13:32:32 2009	(r5183)
+++ trunk/CMakeLists.txt	Sun Jan 18 14:10:53 2009	(r5184)
@@ -125,6 +125,10 @@
 SET( CMAKE_REQUIRED_DEFINITIONS "" )
 CHECK_FUNCTION_EXISTS( flock HAVE_FLOCK )
 
+IF ( APPLE ) 
+	SET( OPENSYNC_PREVENT_CLIENT_SHUTDOWN "1" )
+ENDIF ( APPLE )
+
 # add uninstall target
 CONFIGURE_FILE(	"${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 

Modified: trunk/config.h.cmake
==============================================================================
--- trunk/config.h.cmake	Sun Jan 18 13:32:32 2009	(r5183)
+++ trunk/config.h.cmake	Sun Jan 18 14:10:53 2009	(r5184)
@@ -25,4 +25,6 @@
 #define OPENSYNC_TESTDATA "${CMAKE_CURRENT_SOURCE_DIR}/tests/data"
 #cmakedefine OPENSYNC_UNITTESTS
 
+#cmakedefine OPENSYNC_PREVENT_CLIENT_SHUTDOWN
+
 #endif /* _CONFIG_H_OPENSYNC */

Modified: trunk/opensync/client/opensync_client_proxy.c
==============================================================================
--- trunk/opensync/client/opensync_client_proxy.c	Sun Jan 18 13:32:32 2009	(r5183)
+++ trunk/opensync/client/opensync_client_proxy.c	Sun Jan 18 14:10:53 2009	(r5184)
@@ -1055,8 +1055,9 @@
 		goto error;
 			
 	if (proxy->type == OSYNC_START_TYPE_THREAD) {
+#ifndef OPENSYNC_PREVENT_CLIENT_SHUTDOWN
 		osync_client_shutdown(proxy->client);
-		
+#endif
 		osync_client_unref(proxy->client);
 	} else if (proxy->type == OSYNC_START_TYPE_PROCESS) {
 		if (proxy->child_pid) {