Changeset 584 for trunk/client/src/ndpsmb.c

Timestamp:

Jun 28, 2011, 6:48:51 PM (14 years ago)

Author:

Silvan Scherrer

Message:

samba client 2.1: prepare for 2.2

File:

• trunk/client/src/ndpsmb.c (modified) (3 diffs)

trunk/client/src/ndpsmb.c

@@ -133 +133 @@
 static int ifL;
 
-/* A mutex to serialize plugin calls because libsmb 3.3 is not thread safe. */
-/* while libsbm 3.5 should be threadsafe again, remember to remove it then */
+/* A mutex to serialize plugin calls because libsmb may not be thread safe. */
 static NDMUTEX mutex;
         
@@ -156 +155 @@
     ph->fsphReleaseMutex (mutex);
 }
+
+#ifndef LIBSMB_THREAD_SAFE
 
 #define ENTER() do {            \
@@ -163 +164 @@
 } while (0)
 
-#define LEAVE()  do { \
+#define LEAVE() do { \
     lockRelease();    \
 } while (0)
+
+#else
+#define ENTER() do { /* nothing */ } while (0)
+#define LEAVE() do { /* nothing */ } while (0)
+#endif
 
 int APIENTRY NdpPluginLoad (PLUGINHELPERTABLE2L *pPHT)