[maemo-commits] [maemo-commits] r16560 - projects/connectivity/osso-gwobex/trunk/src

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-11-04 13:26:45 +0200 (Tue, 04 Nov 2008)
New Revision: 16560

Modified:
   projects/connectivity/osso-gwobex/trunk/src/gw-obex.c
   projects/connectivity/osso-gwobex/trunk/src/obex-priv.h
Log:
commit fdfa02c4699b4a15ff903c8344c26761a029f446
Author: Marcel Holtmann <marcel at holtmann.org>
Date:   Sat Oct 4 14:03:01 2008 +0200

    Use GW_OBEX_THREADS_ENABLED instead of G_THREADS_ENABLED


Modified: projects/connectivity/osso-gwobex/trunk/src/gw-obex.c
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/gw-obex.c	2008-11-04 09:44:05 UTC (rev 16559)
+++ projects/connectivity/osso-gwobex/trunk/src/gw-obex.c	2008-11-04 11:26:45 UTC (rev 16560)
@@ -277,7 +277,7 @@
         ctx->gio_source = NULL;
     }
     GW_OBEX_UNLOCK(ctx);
-#ifdef G_THREADS_ENABLED
+#ifdef GW_OBEX_THREADS_ENABLED
     g_mutex_free(ctx->mutex);
     ctx->mutex = NULL;
 #endif
@@ -300,7 +300,7 @@
 
     ctx = make_context(handle);
 
-#ifdef G_THREADS_ENABLED
+#ifdef GW_OBEX_THREADS_ENABLED
     if (!g_thread_supported())
         g_thread_init(NULL);
     ctx->mutex = g_mutex_new();
@@ -311,7 +311,7 @@
     debug("Connecting to OBEX service\n");
     if (!gw_obex_connect(ctx, uuid, uuid_len)) {
         debug("Unable to connect to OBEX service\n");
-#ifdef G_THREADS_ENABLED
+#ifdef GW_OBEX_THREADS_ENABLED
         g_mutex_free(ctx->mutex);
         ctx->mutex = NULL;
 #endif

Modified: projects/connectivity/osso-gwobex/trunk/src/obex-priv.h
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/obex-priv.h	2008-11-04 09:44:05 UTC (rev 16559)
+++ projects/connectivity/osso-gwobex/trunk/src/obex-priv.h	2008-11-04 11:26:45 UTC (rev 16560)
@@ -72,7 +72,7 @@
 #define OBP_TYPE "x-obex/object-profile"
 #define LST_TYPE "x-obex/folder-listing"
 
-#ifdef G_THREADS_ENABLED
+#ifdef GW_OBEX_THREADS_ENABLED
 # ifdef DEBUG
 #  define GW_OBEX_LOCK(ctx) do { \
       debug("Attempting GW_OBEX_LOCK at %s:%d (%s)...", __FILE__, __LINE__, __PRETTY_FUNCTION__); \
@@ -105,7 +105,7 @@
 } __attribute__ ((packed)) obex_connect_hdr_t;
 
 struct gw_obex {
-#ifdef G_THREADS_ENABLED
+#ifdef GW_OBEX_THREADS_ENABLED
     /* To get rid of race conditions in multithreaded apps */
     GMutex                  *mutex;
 #endif