4 files changed, 34 insertions, 3 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index ced68aa762..d3968452c3 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -127,6 +127,9 @@
 /* Define if you have the bigcrypt function.  */
 #undef HAVE_BIGCRYPT
 
+/* Define if you have the bzero function.  */
+#undef HAVE_BZERO
+
 /* Define if you have the chmod function.  */
 #undef HAVE_CHMOD
 
@@ -190,6 +193,9 @@
 /* Define if you have the memmove function.  */
 #undef HAVE_MEMMOVE
 
+/* Define if you have the memset function.  */
+#undef HAVE_MEMSET
+
 /* Define if you have the mktime function.  */
 #undef HAVE_MKTIME
 
@@ -286,6 +292,9 @@
 /* Define if you have the <limits.h> header file.  */
 #undef HAVE_LIMITS_H
 
+/* Define if you have the <memory.h> header file.  */
+#undef HAVE_MEMORY_H
+
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 
@@ -310,6 +319,9 @@
 /* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
 
+/* Define if you have the <strings.h> header file.  */
+#undef HAVE_STRINGS_H
+
 /* Define if you have the <sys/dir.h> header file.  */
 #undef HAVE_SYS_DIR_H
 
@@ -346,6 +358,9 @@
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <rpcsvc/ypclnt.h> header file.  */
+#undef HAVE_RPCSVC_YPCLNT_H
+
 /* Define if you have the <sys/security.h> header file.  */
 #undef HAVE_SYS_SECURITY_H
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 237251209a..42ec579692 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -71,6 +71,14 @@
 #include <string.h>
 #endif
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif
@@ -241,6 +249,10 @@
 #include <compat.h>
 #endif
 
+#ifdef HAVE_RPCSVC_YPCLNT_H
+#include <rpcsvc/ypclnt.h>
+#endif
+
 #ifndef uchar
 #define uchar unsigned char
 #endif
@@ -470,4 +482,8 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid);
 int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
 #endif
 
+#if !defined(HAVE_BZERO) && defined(HAVE_MEMSET)
+#define bzero(a,b) memset((a),'\0',(b))
+#endif
+
 #endif /* _INCLUDES_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1cab9c5e9d..74e240cfa3 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -63,8 +63,8 @@ void add_char_string(char *s);
 
 /*The following definitions come from  lib/debug.c  */
 
-int sig_usr2( void );
-int sig_usr1( void );
+void sig_usr2( int sig );
+void sig_usr1( int sig );
 void setup_logging( char *pname, BOOL interactive );
 void reopen_logs( void );
 void force_check_log_size( void );
diff --git a/source3/include/smb.h b/source3/include/smb.h
index b060134d8e..fa5d496ceb 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1274,7 +1274,7 @@ char *strdup(char *s);
 #endif
 
 #ifndef SIGNAL_CAST
-#define SIGNAL_CAST (RETSIGTYPE (*)())
+#define SIGNAL_CAST (RETSIGTYPE (*)(int))
 #endif
 
 #ifndef SELECT_CAST