From 6bc1ce996d67c5f0d2c2d8571cbaabaf51e26d8d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 11 May 2009 22:33:32 -0700 Subject: Fix definition of smb_thread_once - must return int not void as it's used in a ? : comparison macro. Jeremy. --- lib/util/smb_threads.c | 5 ++++- 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; -- cgit