Home Explore Help
Sign In
sdl
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

We don't need to check for snprintf() anymore, we don't use it.

SDL_snprintf() is built on vsnprintf() where available.
Ryan C. Gordon 11 years ago
parent
e769374096
commit
5c383489a7
17 changed files with 2 additions and 19 deletions
Unified View Show Diff Stats
  1. 1 2
      CMakeLists.txt
  2. 1 2
      configure.in
  3. 0 1
      include/SDL_config.h.cmake
  4. 0 1
      include/SDL_config_android.h
  5. 0 1
      include/SDL_config_iphoneos.h
  6. 0 1
      include/SDL_config_macosx.h
  7. 0 1
      include/SDL_config_pandora.h
  8. 0 1
      include/SDL_config_psp.h
  9. 0 1
      include/SDL_config_wiz.h
  10. 0 1
      premake/Linux/SDL_config_premake.h
  11. 0 1
      premake/Xcode-iOS/SDL_config_premake.h
  12. 0 1
      premake/Xcode/Xcode3/SDL_config_premake.h
  13. 0 1
      premake/Xcode/Xcode4/SDL_config_premake.h
  14. 0 1
      premake/config/SDL_config_cygwin.template.h
  15. 0 1
      premake/config/SDL_config_iphoneos.template.h
  16. 0 1
      premake/config/SDL_config_linux.template.h
  17. 0 1
      premake/config/SDL_config_macosx.template.h

+ 1 - 2
CMakeLists.txt
View File 

@@ -503,14 +503,13 @@ if(LIBC)
 
     check_c_source_compiles("#include <sys/types.h>
 
     check_c_source_compiles("#include <sys/types.h>
 
                              #include <sys/mman.h>
 
                              #include <sys/mman.h>
 
                              int main() { }" HAVE_MPROTECT)
 
                              int main() { }" HAVE_MPROTECT)
 
-    # FIXME: we don't care if you have snprintf, etc, any more. We only care if you have vsnprintf. Clean this up.
 
     foreach(_FN
 
     foreach(_FN
 
             strtod malloc calloc realloc free getenv setenv putenv unsetenv
 
             strtod malloc calloc realloc free getenv setenv putenv unsetenv
 
             qsort abs bcopy memset memcpy memmove memcmp strlen strlcpy strlcat
 
             qsort abs bcopy memset memcpy memmove memcmp strlen strlcpy strlcat
 
             strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa
 
             strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa
 
             _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull
 
             _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull
 
             atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp
 
             atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp
 
-            vsscanf snprintf vsnprintf fseeko fseeko64 sigaction setjmp
 
+            vsscanf vsnprintf fseeko fseeko64 sigaction setjmp
 
             nanosleep sysconf sysctlbyname
 
             nanosleep sysconf sysctlbyname
 
             )
 
             )
 
       string(TOUPPER ${_FN} _UPPER)
 
       string(TOUPPER ${_FN} _UPPER)

+ 1 - 2
configure.in
View File 

@@ -268,8 +268,7 @@ if test x$enable_libc = xyes; then
 
         AC_DEFINE(HAVE_MPROTECT, 1, [ ])
 
         AC_DEFINE(HAVE_MPROTECT, 1, [ ])
 
         ]),
 
         ]),
 
     )
 
     )
 
-    dnl FIXME: we don't care if you have snprintf, etc, any more. We only care if you have vsnprintf. Clean this up.
 
-    AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strlcpy strlcat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp vsscanf snprintf vsnprintf fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname)
 
+    AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strlcpy strlcat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp vsscanf vsnprintf fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname)
 
 
 
     AC_CHECK_LIB(m, pow, [LIBS="$LIBS -lm"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm"])
 
     AC_CHECK_LIB(m, pow, [LIBS="$LIBS -lm"; EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm"])
 
     AC_CHECK_FUNCS(atan atan2 acos asin ceil copysign cos cosf fabs floor log pow scalbn sin sinf sqrt)
 
     AC_CHECK_FUNCS(atan atan2 acos asin ceil copysign cos cosf fabs floor log pow scalbn sin sinf sqrt)

+ 0 - 1
include/SDL_config.h.cmake
View File 

@@ -125,7 +125,6 @@
 
 #cmakedefine HAVE__STRNICMP 1
 
 #cmakedefine HAVE__STRNICMP 1
 
 #cmakedefine HAVE_STRNCASECMP 1
 
 #cmakedefine HAVE_STRNCASECMP 1
 
 #cmakedefine HAVE_VSSCANF 1
 
 #cmakedefine HAVE_VSSCANF 1
 
-#cmakedefine HAVE_SNPRINTF 1
 
 #cmakedefine HAVE_VSNPRINTF 1
 
 #cmakedefine HAVE_VSNPRINTF 1
 
 #cmakedefine HAVE_M_PI 1
 
 #cmakedefine HAVE_M_PI 1
 
 #cmakedefine HAVE_ATAN 1
 
 #cmakedefine HAVE_ATAN 1

+ 0 - 1
include/SDL_config_android.h
View File 

@@ -82,7 +82,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_M_PI   1
 
 #define HAVE_M_PI   1
 
 #define HAVE_ATAN   1
 
 #define HAVE_ATAN   1

+ 0 - 1
include/SDL_config_iphoneos.h
View File 

@@ -80,7 +80,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_M_PI   1
 
 #define HAVE_M_PI   1
 
 #define HAVE_ATAN   1
 
 #define HAVE_ATAN   1

+ 0 - 1
include/SDL_config_macosx.h
View File 

@@ -83,7 +83,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_CEIL   1
 
 #define HAVE_CEIL   1
 
 #define HAVE_COPYSIGN   1
 
 #define HAVE_COPYSIGN   1

+ 0 - 1
include/SDL_config_pandora.h
View File 

@@ -82,7 +82,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_M_PI 1
 
 #define HAVE_M_PI 1
 
 #define HAVE_CEIL 1
 
 #define HAVE_CEIL 1

+ 0 - 1
include/SDL_config_psp.h
View File 

@@ -80,7 +80,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_M_PI   1
 
 #define HAVE_M_PI   1
 
 #define HAVE_ATAN   1
 
 #define HAVE_ATAN   1

+ 0 - 1
include/SDL_config_wiz.h
View File 

@@ -76,7 +76,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_M_PI 1
 
 #define HAVE_M_PI 1
 
 #define HAVE_CEIL 1
 
 #define HAVE_CEIL 1

+ 0 - 1
premake/Linux/SDL_config_premake.h
View File 

@@ -129,7 +129,6 @@
 
 /* #undef HAVE__STRNICMP */
 
 /* #undef HAVE__STRNICMP */
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_M_PI /**/
 
 #define HAVE_M_PI /**/
 
 #define HAVE_ATAN 1
 
 #define HAVE_ATAN 1

+ 0 - 1
premake/Xcode-iOS/SDL_config_premake.h
View File 

@@ -80,7 +80,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_M_PI   1
 
 #define HAVE_M_PI   1
 
 #define HAVE_ATAN   1
 
 #define HAVE_ATAN   1

+ 0 - 1
premake/Xcode/Xcode3/SDL_config_premake.h
View File 

@@ -86,7 +86,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_CEIL   1
 
 #define HAVE_CEIL   1
 
 #define HAVE_COPYSIGN   1
 
 #define HAVE_COPYSIGN   1

+ 0 - 1
premake/Xcode/Xcode4/SDL_config_premake.h
View File 

@@ -86,7 +86,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_CEIL   1
 
 #define HAVE_CEIL   1
 
 #define HAVE_COPYSIGN   1
 
 #define HAVE_COPYSIGN   1

+ 0 - 1
premake/config/SDL_config_cygwin.template.h
View File 

@@ -125,7 +125,6 @@
 
 /* #undef HAVE__STRNICMP */
 
 /* #undef HAVE__STRNICMP */
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_M_PI /**/
 
 #define HAVE_M_PI /**/
 
 #define HAVE_ATAN 1
 
 #define HAVE_ATAN 1

+ 0 - 1
premake/config/SDL_config_iphoneos.template.h
View File 

@@ -80,7 +80,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_M_PI   1
 
 #define HAVE_M_PI   1
 
 #define HAVE_ATAN   1
 
 #define HAVE_ATAN   1

+ 0 - 1
premake/config/SDL_config_linux.template.h
View File 

@@ -129,7 +129,6 @@
 
 /* #undef HAVE__STRNICMP */
 
 /* #undef HAVE__STRNICMP */
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_VSNPRINTF 1
 
 #define HAVE_M_PI /**/
 
 #define HAVE_M_PI /**/
 
 #define HAVE_ATAN 1
 
 #define HAVE_ATAN 1

+ 0 - 1
premake/config/SDL_config_macosx.template.h
View File 

@@ -86,7 +86,6 @@
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_STRNCASECMP 1
 
 #define HAVE_VSSCANF 1
 
 #define HAVE_VSSCANF 1
 
-#define HAVE_SNPRINTF   1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_VSNPRINTF  1
 
 #define HAVE_CEIL   1
 
 #define HAVE_CEIL   1
 
 #define HAVE_COPYSIGN   1
 
 #define HAVE_COPYSIGN   1