diff options
| -rw-r--r-- | source3/lib/getsmbpass.c | 2 | ||||
| -rw-r--r-- | source3/lib/netmask.c | 5 | ||||
| -rw-r--r-- | source3/lib/replace.c | 5 | ||||
| -rw-r--r-- | source3/lib/ufc.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/smbdes.c | 1 | ||||
| -rw-r--r-- | source3/locking/locking_slow.c | 4 | ||||
| -rw-r--r-- | source3/passdb/ldap.c | 1 | ||||
| -rw-r--r-- | source3/passdb/nispass.c | 1 | ||||
| -rw-r--r-- | source3/printing/print_svid.c | 1 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_ldap_helpers.c | 4 | ||||
| -rw-r--r-- | source3/smbd/quotas.c | 1 | ||||
| -rw-r--r-- | source3/smbd/ssl.c | 1 | ||||
| -rw-r--r-- | source3/smbwrapper/smbw.c | 4 |
14 files changed, 25 insertions, 11 deletions
diff --git a/source3/lib/getsmbpass.c b/source3/lib/getsmbpass.c index 7e544fa8d0..0874529d32 100644 --- a/source3/lib/getsmbpass.c +++ b/source3/lib/getsmbpass.c @@ -151,6 +151,6 @@ char *getsmbpass(char *prompt) } #else - + void getsmbpasswd_dummy(void); void getsmbpasswd_dummy(void) {;} #endif diff --git a/source3/lib/netmask.c b/source3/lib/netmask.c index d9bc06c47a..6d71058375 100644 --- a/source3/lib/netmask.c +++ b/source3/lib/netmask.c @@ -51,6 +51,11 @@ #include <sys/sockio.h> #endif +/* + * Prototype for gcc in fussy mode. + */ + +int get_netmask(struct in_addr *ipaddr, struct in_addr *nmask); /**************************************************************************** get the netmask address for a local interface diff --git a/source3/lib/replace.c b/source3/lib/replace.c index 948dfdf9c8..a354458a68 100644 --- a/source3/lib/replace.c +++ b/source3/lib/replace.c @@ -23,9 +23,8 @@ extern int DEBUGLEVEL; - - void replace_dummy(void) -{} + void replace_dummy(void); + void replace_dummy(void) {} #ifndef HAVE_FTRUNCATE diff --git a/source3/lib/ufc.c b/source3/lib/ufc.c index f464953498..86cb41a10c 100644 --- a/source3/lib/ufc.c +++ b/source3/lib/ufc.c @@ -778,6 +778,6 @@ static ufc_long *_ufc_doit(l1, l2, r1, r2, itr) #else - int ufc_dummy_procedure(void) -{return 0;} + int ufc_dummy_procedure(void); + int ufc_dummy_procedure(void) {return 0;} #endif diff --git a/source3/libsmb/smbdes.c b/source3/libsmb/smbdes.c index 46b337cda8..9d531ef26d 100644 --- a/source3/libsmb/smbdes.c +++ b/source3/libsmb/smbdes.c @@ -22,6 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "includes.h" /* NOTES: diff --git a/source3/locking/locking_slow.c b/source3/locking/locking_slow.c index fd95fd45ec..f2c2d3e9d9 100644 --- a/source3/locking/locking_slow.c +++ b/source3/locking/locking_slow.c @@ -1071,6 +1071,6 @@ struct share_ops *locking_slow_init(int ronly) return &share_ops; } #else - int locking_slow_dummy_procedure(void) -{return 0;} + int locking_slow_dummy_procedure(void); + int locking_slow_dummy_procedure(void) {return 0;} #endif /* !FAST_SHARE_MODES */ diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c index 59c6cd3d4f..59b06d7e6f 100644 --- a/source3/passdb/ldap.c +++ b/source3/passdb/ldap.c @@ -993,5 +993,6 @@ struct passdb_ops *ldap_initialize_password_db(void) } #else + void dummy_function(void); void dummy_function(void) { } /* stop some compilers complaining */ #endif diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c index 4a2a7723d6..32cf42f95b 100644 --- a/source3/passdb/nispass.c +++ b/source3/passdb/nispass.c @@ -673,6 +673,7 @@ struct passdb_ops *nisplus_initialize_password_db(void) } #else + void nisplus_dummy_function(void); void nisplus_dummy_function(void) { } /* stop some compilers complaining */ #endif /* WITH_NISPLUS */ diff --git a/source3/printing/print_svid.c b/source3/printing/print_svid.c index 1f9f75a4fa..5c5eebeb50 100644 --- a/source3/printing/print_svid.c +++ b/source3/printing/print_svid.c @@ -117,5 +117,6 @@ int sysv_printername_ok(char *name) #else /* this keeps fussy compilers happy */ + void print_svid_dummy(void); void print_svid_dummy(void) {} #endif diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 0fe248068e..f252c99d97 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -585,7 +585,7 @@ BOOL rpc_api_pipe_req(struct cli_state *cli, uint8 op_num, BOOL ret; BOOL auth_verify; BOOL auth_seal; - uint32 crc32; + uint32 crc32 = 0; auth_verify = IS_BITS_SET_ALL(cli->ntlmssp_srv_flgs, NTLMSSP_NEGOTIATE_SIGN); auth_seal = IS_BITS_SET_ALL(cli->ntlmssp_srv_flgs, NTLMSSP_NEGOTIATE_SEAL); diff --git a/source3/rpc_server/srv_ldap_helpers.c b/source3/rpc_server/srv_ldap_helpers.c index fb2442789c..4db841990e 100644 --- a/source3/rpc_server/srv_ldap_helpers.c +++ b/source3/rpc_server/srv_ldap_helpers.c @@ -9,6 +9,6 @@ extern int DEBUGLEVEL; #else /* USE_LDAP */ /* this keeps fussy compilers happy */ -void ldap_helper_dummy(void) -{} + void ldap_helper_dummy(void); + void ldap_helper_dummy(void) {} #endif /* USE_LDAP */ diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c index b7a538e189..716c2357c6 100644 --- a/source3/smbd/quotas.c +++ b/source3/smbd/quotas.c @@ -661,6 +661,7 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize) #else /* this keeps fussy compilers happy */ + void quotas_dummy(void); void quotas_dummy(void) {} #endif /* QUOTAS */ diff --git a/source3/smbd/ssl.c b/source3/smbd/ssl.c index 27bb8f3a52..1c953272c3 100644 --- a/source3/smbd/ssl.c +++ b/source3/smbd/ssl.c @@ -261,5 +261,6 @@ char *reqHosts, *resignHosts; } #else /* WITH_SSL */ + void ssl_dummy(void); void ssl_dummy(void) {;} /* So some compilers don't complain. */ #endif /* WITH_SSL */ diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c index 76cd92e607..0d713da797 100644 --- a/source3/smbwrapper/smbw.c +++ b/source3/smbwrapper/smbw.c @@ -1417,6 +1417,10 @@ struct kernel_stat { unsigned long int __unused5; }; +/* + * Prototype for gcc in 'fussy' mode. + */ + void xstat_convert(int vers, struct stat *st, struct kernel_stat *kbuf); void xstat_convert(int vers, struct stat *st, struct kernel_stat *kbuf) { #ifdef _STAT_VER_LINUX_OLD |