[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1103-g5cbd755

[Jeremy Allison]

The branch, master has been updated
       via  5cbd7556c23c4dddc96f19b6977d57b8e3f551d7 (commit)
      from  86b0d56897435c1a95c17d32a914b9757358d358 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5cbd7556c23c4dddc96f19b6977d57b8e3f551d7
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Apr 20 04:25:26 2009 -0700

    Ensure we have all the definitions needed in both threaded and non-threaded versions.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 lib/util/smb_threads.h |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/smb_threads.h b/lib/util/smb_threads.h
index 682e142..3d3d48e 100644
--- a/lib/util/smb_threads.h
+++ b/lib/util/smb_threads.h
@@ -20,22 +20,17 @@
 #ifndef _smb_threads_h_
 #define _smb_threads_h_
 
-#if defined(HAVE_PTHREAD_H)
-#include <pthread.h>
-#endif
-
 /* Data types needed for smb_thread_once call. */
-#if defined(HAVE_PTHREAD_H)
-#define smb_thread_once_t pthread_once_t
-#else
-#define smb_thread_once_t bool
-#endif
 
 #if defined(HAVE_PTHREAD_H)
+#include <pthread.h>
+#define smb_thread_once_t pthread_once_t
 #define SMB_THREAD_ONCE_INIT PTHREAD_ONCE_INIT
 #define SMB_THREAD_ONCE_IS_INITIALIZED(val) (true)
 #define SMB_THREAD_ONCE_INITIALIZE(val)
 #else
+#define smb_thread_once_t bool
+#define SMB_THREAD_ONCE_INIT false
 #define SMB_THREAD_ONCE_IS_INITIALIZED(val) ((val) == true)
 #define SMB_THREAD_ONCE_INITIALIZE(val) ((val) = true)
 #endif


-- 
Samba Shared Repository