Author: tridge Date: 2006-09-06 00:06:00 +0000 (Wed, 06 Sep 2006) New Revision: 18111
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18111 Log: base inclusion of replacement printf fns on function existance, not declaration. Otherwise _GNU_SOURCE and _BSD_SOURCE stuffs things up (possibly fixable, but not now) Modified: branches/SAMBA_4_0/source/lib/replace/replace.h Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/replace.h =================================================================== --- branches/SAMBA_4_0/source/lib/replace/replace.h 2006-09-05 23:48:05 UTC (rev 18110) +++ branches/SAMBA_4_0/source/lib/replace/replace.h 2006-09-06 00:06:00 UTC (rev 18111) @@ -139,11 +139,6 @@ int rep_ftruncate(int f,long l); #endif -#ifndef HAVE_VASPRINTF_DECL -#define vasprintf rep_vasprintf -int rep_vasprintf(char **ptr, const char *format, va_list ap); -#endif - #if !defined(HAVE_BZERO) && defined(HAVE_MEMSET) #define bzero(a,b) memset((a),'\0',(b)) #endif @@ -161,12 +156,22 @@ #endif #endif -/* add varargs prototypes with printf checking */ -#ifndef HAVE_SNPRINTF_DECL +#ifndef HAVE_VASPRINTF +#define vasprintf rep_vasprintf +int rep_vasprintf(char **ptr, const char *format, va_list ap); +#endif + +#ifndef HAVE_SNPRINTF #define snprintf rep_snprintf int rep_snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); #endif -#ifndef HAVE_ASPRINTF_DECL + +#ifndef HAVE_VSNPRINTF +#define vsnprintf rep_vsnprintf +int rep_vsnprintf(char *,size_t ,const char *, va_list ap); +#endif + +#ifndef HAVE_ASPRINTF #define asprintf rep_asprintf int rep_asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #endif
