Commit f28e4f38 authored by Jelmer Vernooij's avatar Jelmer Vernooij Committed by Gerald (Jerry) Carter
Browse files

r1111: Rename vsnprintf to smb_vsnprintf so we don't get duplicate symbol errors 

when linking against an app that does have vsnprintf() (bug #478)
(This used to be commit 9f1c978088321b09dea96c54026ebdfaaf770641)
parent e107e979

source3/include/includes.h

+1 −0
Original line number Diff line number Diff line
@@ -1239,6 +1239,7 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); 


#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)

#define snprintf smb_snprintf

#define vsnprintf smb_vsnprintf

#endif



void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3);

source3/lib/snprintf.c

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c) 
	(*currlen)++;

}



 int vsnprintf (char *str, size_t count, const char *fmt, va_list args)

 int smb_vsnprintf (char *str, size_t count, const char *fmt, va_list args)

{

	return dopr(str, count, fmt, args);

}