diff options
| author | Jeremy Allison <jra@samba.org> | 2009-05-11 22:33:32 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-05-11 22:33:32 -0700 |
| commit | 6bc1ce996d67c5f0d2c2d8571cbaabaf51e26d8d (patch) | |
| tree | 268045d07d596d0fd7846679eaa1c8cd6e752e44 | |
| parent | b4c9cfb2af8f4dd5e18f032c410694e491f1bd74 (diff) | |
| download | samba-6bc1ce996d67c5f0d2c2d8571cbaabaf51e26d8d.tar.gz samba-6bc1ce996d67c5f0d2c2d8571cbaabaf51e26d8d.tar.bz2 samba-6bc1ce996d67c5f0d2c2d8571cbaabaf51e26d8d.zip | |
Fix definition of smb_thread_once - must return int not void as
it's used in a ? : comparison macro.
Jeremy.
| -rw-r--r-- | lib/util/smb_threads.c | 5 | ||||
| -rw-r--r-- | lib/util/smb_threads.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/util/smb_threads.c b/lib/util/smb_threads.c index 22afcd378f..04079767d6 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 012b61c1ed..5079b17c6d 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; |