From: <svn...@op...> - 2009-10-17 16:01:37
|
Author: bellmich Date: Sat Oct 17 18:01:15 2009 New Revision: 1344 URL: http://libsyncml.opensync.org/changeset/1344 Log: committed patch from Henrik ticket #248 I only removed one thing from the patch. The pthread header file must still be included from sml_support.c. Modified: trunk/CMakeLists.txt trunk/ChangeLog trunk/libsyncml/CMakeLists.txt trunk/libsyncml/objects/sml_devinf_obj.c trunk/libsyncml/sml_support.c trunk/libsyncml/sml_support.h trunk/libsyncml/sml_thread.c trunk/libsyncml/transports/obex_client.c trunk/tools/syncml-ds-tool.c Modified: trunk/CMakeLists.txt ============================================================================== --- trunk/CMakeLists.txt Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/CMakeLists.txt Sat Oct 17 18:01:15 2009 (r1344) @@ -196,6 +196,12 @@ SET( MEMORYCHECK_AVAILABLE OFF ) ENDIF(MEMORYCHECK_COMMAND) +IF(MINGW) + SET( WINSOCK_LIBRARIES "-lwsock32" ) +ELSE(MINGW) + SET( WINSOCK_LIBRARIES "" ) +ENDIF(MINGW) + OPTION( ENABLE_TOOLS "enable building tools" ON ) OPTION( ENABLE_TRACE "enable tracing" ON ) Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/ChangeLog Sat Oct 17 18:01:15 2009 (r1344) @@ -2,6 +2,8 @@ * server can handle now several sessions at once * transport cleanup is now much more robust * map fragmentation is supported + * Henrik Kaare Poulsen <he...@ka...> fixed several + MinGW/MS Windows portability issues (r1344). * Jim Radford <ra...@bl...> supplied some patches: * a fix for some hangs on 64 bit machines because of mixed data types (r1285) Modified: trunk/libsyncml/CMakeLists.txt ============================================================================== --- trunk/libsyncml/CMakeLists.txt Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/libsyncml/CMakeLists.txt Sat Oct 17 18:01:15 2009 (r1344) @@ -69,7 +69,7 @@ SET_TARGET_PROPERTIES( syncml PROPERTIES SOVERSION ${LIBSYNCML_LIBVERSION_SOVERSION} ) SET_TARGET_PROPERTIES( syncml PROPERTIES VERSION ${LIBSYNCML_LIBVERSION_VERSION} ) -TARGET_LINK_LIBRARIES( syncml ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GOBJECT2_LIBRARIES} ${LIBXML2_LIBRARIES} ${BLUEZ_LIBRARIES} ${LIBWBXML2_LIBRARIES} ${LIBSOUP2_LIBRARIES} ${OPENOBEX_LIBRARIES} ) +TARGET_LINK_LIBRARIES( syncml ${WINSOCK_LIBRARIES} ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GOBJECT2_LIBRARIES} ${LIBXML2_LIBRARIES} ${BLUEZ_LIBRARIES} ${LIBWBXML2_LIBRARIES} ${LIBSOUP2_LIBRARIES} ${OPENOBEX_LIBRARIES} ) INSTALL( TARGETS syncml DESTINATION ${LIBSYNCML_LIBRARIES_DIR} ) Modified: trunk/libsyncml/objects/sml_devinf_obj.c ============================================================================== --- trunk/libsyncml/objects/sml_devinf_obj.c Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/libsyncml/objects/sml_devinf_obj.c Sat Oct 17 18:01:15 2009 (r1344) @@ -35,6 +35,10 @@ #ifdef WIN32 #include <windef.h> +#ifndef MSVC +// For MinGW +#include <winbase.h> +#endif #else #include<sys/utsname.h> #endif Modified: trunk/libsyncml/sml_support.c ============================================================================== --- trunk/libsyncml/sml_support.c Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/libsyncml/sml_support.c Sat Oct 17 18:01:15 2009 (r1344) @@ -31,6 +31,8 @@ #include <pthread.h> #endif +GPrivate* thread_id = NULL; + GPrivate* current_tabs = NULL; #define G_ERRORCHECK_MUTEXES Modified: trunk/libsyncml/sml_support.h ============================================================================== --- trunk/libsyncml/sml_support.h Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/libsyncml/sml_support.h Sat Oct 17 18:01:15 2009 (r1344) @@ -26,6 +26,8 @@ #include <stdio.h> #include <stdlib.h> +extern GPrivate* thread_id; + /*! @ingroup SmlDebugAPI * @brief The type of the trace */ typedef enum { Modified: trunk/libsyncml/sml_thread.c ============================================================================== --- trunk/libsyncml/sml_thread.c Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/libsyncml/sml_thread.c Sat Oct 17 18:01:15 2009 (r1344) @@ -24,7 +24,7 @@ #include "sml_support.h" #include "sml_error_internals.h" -GPrivate* thread_id = NULL; + #define G_ERRORCHECK_MUTEXES Modified: trunk/libsyncml/transports/obex_client.c ============================================================================== --- trunk/libsyncml/transports/obex_client.c Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/libsyncml/transports/obex_client.c Sat Oct 17 18:01:15 2009 (r1344) @@ -867,7 +867,7 @@ struct sockaddr_in addr; memset(&addr, 0, sizeof(addr)); addr.sin_family = AF_INET; - addr.sin_port = htons(env->port); + addr.sin_port = g_htons(env->port); struct hostent *hostinfo = gethostbyname (env->path); if (!hostinfo) { Modified: trunk/tools/syncml-ds-tool.c ============================================================================== --- trunk/tools/syncml-ds-tool.c Sat Oct 17 17:29:25 2009 (r1343) +++ trunk/tools/syncml-ds-tool.c Sat Oct 17 18:01:15 2009 (r1344) @@ -382,9 +382,11 @@ printf("OBEX_Init failed\n"); return; } - + +#ifndef WIN32 if (geteuid() != 0) fprintf(stderr, "Superuser privileges are required to access complete USB information.\n"); +#endif interfaces_number = OBEX_FindInterfaces(handle, &obex_intf); printf("Found %d USB OBEX interfaces\n", interfaces_number); |