3 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/debug.h b/source3/include/debug.h
index e59a45cba1..3130bc379d 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -40,12 +40,12 @@
 #ifdef HAVE_STDARG_H
 int  Debug1( char *, ... )
 #ifdef __GNUC__
-     __attribute__ ((format (printf, 1, 2)))
+     __attribute__ ((format (__printf__, 1, 2)))
 #endif
 ;
 BOOL dbgtext( char *, ... )
 #ifdef __GNUC__
-     __attribute__ ((format (printf, 1, 2)))
+     __attribute__ ((format (__printf__, 1, 2)))
 #endif
 ;
 #else
diff --git a/source3/include/proto.h b/source3/include/proto.h
index b29e3aa788..c1c1cd8e35 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1370,6 +1370,7 @@ char *lp_winbind_gid(void);
 char *lp_template_homedir(void);
 char *lp_template_shell(void);
 char *lp_winbind_separator(void);
+char *lp_codepagedir(void);
 char *lp_ldap_server(void);
 char *lp_ldap_suffix(void);
 char *lp_ldap_filter(void);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 4d4aef088e..1bc1d3fba4 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1286,7 +1286,7 @@ struct bitmap {
 #ifdef HAVE_STDARG_H
 int slprintf(char *str, int n, char *format, ...)
 #ifdef __GNUC__
-     __attribute__ ((format (printf, 3, 4)))
+     __attribute__ ((format (__printf__, 3, 4)))
 #endif
 ;
 #else
@@ -1296,7 +1296,7 @@ int slprintf();
 #ifdef HAVE_STDARG_H
 int fdprintf(int fd, char *format, ...)
 #ifdef __GNUC__
-     __attribute__ ((format (printf, 2, 3)))
+     __attribute__ ((format (__printf__, 2, 3)))
 #endif
 ;
 #else