X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_stringf.h;fp=ETL%2Ftrunk%2FETL%2F_stringf.h;h=3d0c020106dfb4bb373051cd9922d1d72b25d81c;hb=4cfe2b68ebd2556f9926965dcea2ca8f3fc050ea;hp=22939a2dbcb7c2231d6283c7d888529ba3e8c996;hpb=697bc5a5331b2750271bb68d401adb329ed7d95e;p=synfig.git

diff --git a/ETL/trunk/ETL/_stringf.h b/ETL/trunk/ETL/_stringf.h
index 22939a2..3d0c020 100644
--- a/ETL/trunk/ETL/_stringf.h
+++ b/ETL/trunk/ETL/_stringf.h
@@ -53,13 +53,6 @@
 #define POPEN_BINARY_WRITE_TYPE "w"
 #endif
 
-#ifdef __ETL_HAS__VSNPRINTF
-#ifndef __ETL_HAS_VSNPRINTF
-#define vnsprintf _vnsprintf
-#define __ETL_HAS_VSNPRINTF
-#endif
-#endif
-
 /* === T Y P E D E F S ===================================================== */
 
 _ETL_BEGIN_CDECLS
@@ -73,13 +66,13 @@ _ETL_BEGIN_CDECLS
 // Prefer prototypes from glibc headers, since defining them ourselves
 // works around glibc security mechanisms
 
-#ifdef __ETL_HAS_VASPRINTF	// This is the preferred method
+#ifdef HAVE_VASPRINTF	// This is the preferred method
  #ifndef __GLIBC__
   extern int vasprintf(char **,const char *,va_list)ETL_NO_THROW;
  #endif
 #else
 
-# ifdef __ETL_HAS_VSNPRINTF	// This is the secondary method
+# ifdef HAVE_VSNPRINTF	// This is the secondary method
  #ifndef __GLIBC__
   extern int vsnprintf(char *,size_t,const char*,va_list)ETL_NO_THROW;
  #endif
@@ -87,13 +80,13 @@ _ETL_BEGIN_CDECLS
 
 #endif
 
-#ifdef __ETL_HAS_VSSCANF
+#ifdef HAVE_VSSCANF
  #ifndef __GLIBC__
   extern int vsscanf(const char *,const char *,va_list)ETL_NO_THROW;
  #endif
 #else
 #define ETL_NO_VSTRSCANF
-#ifdef __ETL_HAS_SSCANF
+#ifdef HAVE_SSCANF
  #ifndef __GLIBC__
   extern int sscanf(const char *buf, const char *format, ...)ETL_NO_THROW;
  #endif
@@ -111,7 +104,7 @@ _ETL_BEGIN_NAMESPACE
 inline std::string
 vstrprintf(const char *format, va_list args)
 {
-#ifdef __ETL_HAS_VASPRINTF	// This is the preferred method (and safest)
+#ifdef HAVE_VASPRINTF	// This is the preferred method (and safest)
 	char *buffer;
 	std::string ret;
 	int i=vasprintf(&buffer,format,args);
@@ -122,7 +115,7 @@ vstrprintf(const char *format, va_list args)
 	}
 	return ret;
 #else
-#ifdef __ETL_HAS_VSNPRINTF	// This is the secondary method (Safe, but bulky)
+#ifdef HAVE_VSNPRINTF	// This is the secondary method (Safe, but bulky)
 #warning etl::vstrprintf() has a maximum size of ETL_STRPRINTF_MAX_LENGTH in this configuration.
 #ifdef ETL_THREAD_SAFE
 	char buffer[ETL_STRPRINTF_MAX_LENGTH];
@@ -171,7 +164,7 @@ strscanf(const std::string &data, const char*format, ...)
 }
 #else
 
-#if defined (__ETL_HAS_SSCANF) && defined (__GNUC__)
+#if defined (HAVE_SSCANF) && defined (__GNUC__)
 #define strscanf(data,format,...) sscanf(data.c_str(),format,__VA_ARGS__)
 #endif
 #endif