From a36605449a3c0c870ea319111cac0a5c059c829b Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 25 Mar 2002 21:55:05 +0000 Subject: Don't use the snprintf() and vsnprintf() names; instead, use fl_snprintf() and fl_vsnprintf() and define snprintf and vsnprintf to fl_... (Some compilers treat snprintf() and vsnprintf() differently, and we also don't want to collide with other libraries that might provide their own implementation...) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2031 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/vsnprintf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/vsnprintf.c') diff --git a/src/vsnprintf.c b/src/vsnprintf.c index 4698bd630..ab83a7b02 100644 --- a/src/vsnprintf.c +++ b/src/vsnprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: vsnprintf.c,v 1.3.2.5.2.1 2002/01/01 15:11:32 easysw Exp $" + * "$Id: vsnprintf.c,v 1.3.2.5.2.2 2002/03/25 21:55:05 easysw Exp $" * * vsnprintf() function for the Fast Light Tool Kit (FLTK). * @@ -38,8 +38,7 @@ */ #include -#include -#include +#include "flstring.h" #ifdef HAVE_SYS_STDTYPES_H # include @@ -51,7 +50,7 @@ extern "C" { #if !HAVE_VSNPRINTF -int vsnprintf(char* str, size_t size, const char* fmt, va_list ap) { +int fl_vsnprintf(char* str, size_t size, const char* fmt, va_list ap) { const char* e = str+size-1; char* p = str; char copy[20]; @@ -119,7 +118,7 @@ int vsnprintf(char* str, size_t size, const char* fmt, va_list ap) { #if !HAVE_SNPRINTF -int snprintf(char* str, size_t size, const char* fmt, ...) { +int fl_snprintf(char* str, size_t size, const char* fmt, ...) { int ret; va_list ap; va_start(ap, fmt); @@ -135,6 +134,6 @@ int snprintf(char* str, size_t size, const char* fmt, ...) { #endif /* - * End of "$Id: vsnprintf.c,v 1.3.2.5.2.1 2002/01/01 15:11:32 easysw Exp $". + * End of "$Id: vsnprintf.c,v 1.3.2.5.2.2 2002/03/25 21:55:05 easysw Exp $". */ -- cgit v1.2.3