diff options
| author | Jeremy Allison <jra@samba.org> | 2000-10-06 23:35:55 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-10-06 23:35:55 +0000 |
| commit | 077c41cc60316c44d2f3f85e14fe15acd22ccc1f (patch) | |
| tree | 95a55fe7d01ab0279228ff52d6e5b36679da8d73 /source3/include | |
| parent | 74d4a3b7410547d9f65bfc26de5f22c623574afd (diff) | |
| download | samba-077c41cc60316c44d2f3f85e14fe15acd22ccc1f.tar.gz samba-077c41cc60316c44d2f3f85e14fe15acd22ccc1f.tar.bz2 samba-077c41cc60316c44d2f3f85e14fe15acd22ccc1f.zip | |
Fix for printf attribute from Mattias Gronlund <Mattias.Gronlund@sa.erisoft.se>
Added "codepage directory" patch from Peter.Polkinghorne@brunel.ac.uk
Jeremy.
(This used to be commit e49566c2e21fcd16980e5110495645c5ae5a36da)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/debug.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/include/smb.h | 4 |
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 |