summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-05-30 13:53:20 +0000
committerAndrew Tridgell <tridge@samba.org>2001-05-30 13:53:20 +0000
commitd8f2016d4a3c78c5e5c060b831442018bcd50ff2 (patch)
tree5b828336fa2aa44d97c2dc0592bfa65150f222e1
parent05d08414728313e2ca04cd5ccbd3ce9d3470a0a3 (diff)
downloadsamba-d8f2016d4a3c78c5e5c060b831442018bcd50ff2.tar.gz
samba-d8f2016d4a3c78c5e5c060b831442018bcd50ff2.tar.bz2
samba-d8f2016d4a3c78c5e5c060b831442018bcd50ff2.zip
fixed asprintf declaration
(This used to be commit fbf03c89e6b1980f4f75a657f9760edb7445d8cb)
-rw-r--r--source3/include/includes.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index e30831ac80..e7d983064f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -865,9 +865,6 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid);
#if (defined(USE_SETRESUID) && !defined(HAVE_SETRESGID_DECL))
int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
#endif
-#ifndef HAVE_ASPRINTF_DECL
-int asprintf(char **ptr, const char *format, ...);
-#endif
#ifndef HAVE_VASPRINTF_DECL
int vasprintf(char **ptr, const char *format, va_list ap);
#endif
@@ -1009,11 +1006,11 @@ extern int DEBUGLEVEL;
/* add varargs prototypes with printf checking */
int fdprintf(int , char *, ...) PRINTF_ATTRIBUTE(2,3);
-#ifndef HAVE_SNPRINTF
+#ifndef HAVE_SNPRINTF_DECL
int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4);
#endif
-#ifndef HAVE_ASPRINTF
-int asprintf(char **,char *, ...) PRINTF_ATTRIBUTE(2,3);
+#ifndef HAVE_ASPRINTF_DECL
+int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
#endif
/* we used to use these fns, but now we have good replacements