[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1558-g6bc1ce9

[Jeremy Allison]

The branch, master has been updated
       via  6bc1ce996d67c5f0d2c2d8571cbaabaf51e26d8d (commit)
      from  b4c9cfb2af8f4dd5e18f032c410694e491f1bd74 (commit)

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


- Log -----------------------------------------------------------------
commit 6bc1ce996d67c5f0d2c2d8571cbaabaf51e26d8d
Author: Jeremy Allison <jra at samba.org>
Date:   Mon May 11 22:33:32 2009 -0700

    Fix definition of smb_thread_once - must return int not void as
    it's used in a ? : comparison macro.
    Jeremy.

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

Summary of changes:
 lib/util/smb_threads.c |    5 ++++-
 lib/util/smb_threads.h |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/smb_threads.c b/lib/util/smb_threads.c
index 22afcd3..0407976 100644
--- a/lib/util/smb_threads.c
+++ b/lib/util/smb_threads.c
@@ -104,7 +104,8 @@ int smb_thread_set_functions(const struct smb_thread_functions *tf)
  size variable in code internal to Samba without knowing the
  implementation's "once" type.
 ********************************************************************/
-void smb_thread_once(smb_thread_once_t *ponce, void (*init_fn)(void))
+
+int smb_thread_once(smb_thread_once_t *ponce, void (*init_fn)(void))
 {
         int ret;
         bool need_func_call;
@@ -142,6 +143,8 @@ void smb_thread_once(smb_thread_once_t *ponce, void (*init_fn)(void))
                 /* ... then do so now. */
                 (*init_fn)();
         }
+
+	return 0;
 }
 
 
diff --git a/lib/util/smb_threads.h b/lib/util/smb_threads.h
index 012b61c..5079b17 100644
--- a/lib/util/smb_threads.h
+++ b/lib/util/smb_threads.h
@@ -52,7 +52,7 @@ struct smb_thread_functions {
 };
 
 int smb_thread_set_functions(const struct smb_thread_functions *tf);
-void smb_thread_once(smb_thread_once_t *ponce, void (*init_fn)(void));
+int smb_thread_once(smb_thread_once_t *ponce, void (*init_fn)(void));
 
 extern const struct smb_thread_functions *global_tfp;
 


-- 
Samba Shared Repository