Added _strnicmp support
authorSam Lantinga <slouken@libsdl.org>
Mon, 13 Mar 2006 02:12:39 +0000
changeset 1512 845b1619c8f6
parent 1511 de816bde0bf1
child 1513 13a3520a13f9
Added _strnicmp support
configure.in
include/SDL_config.h.in
include/SDL_config_win32.h
include/SDL_stdinc.h
src/stdlib/SDL_string.c
--- a/configure.in	Mon Mar 13 02:12:15 2006 +0000
+++ b/configure.in	Mon Mar 13 02:12:39 2006 +0000
@@ -116,7 +116,7 @@
     if test x$ac_cv_func_strtod = xyes; then
         AC_DEFINE(HAVE_STRTOD)
     fi
-    AC_CHECK_FUNCS(malloc calloc realloc free getenv 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 strncasecmp sscanf snprintf vsnprintf iconv sigaction setjmp nanosleep)
+    AC_CHECK_FUNCS(malloc calloc realloc free getenv 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 sscanf snprintf vsnprintf iconv sigaction setjmp nanosleep)
 
     AC_CHECK_LIB(m, pow, [BUILD_LDFLAGS="$BUILD_LDFLAGS -lm"])
 fi
--- a/include/SDL_config.h.in	Mon Mar 13 02:12:15 2006 +0000
+++ b/include/SDL_config.h.in	Mon Mar 13 02:12:39 2006 +0000
@@ -119,6 +119,7 @@
 #undef HAVE_STRNCMP
 #undef HAVE__STRICMP
 #undef HAVE_STRCASECMP
+#undef HAVE__STRNICMP
 #undef HAVE_STRNCASECMP
 #undef HAVE_SSCANF
 #undef HAVE_SNPRINTF
--- a/include/SDL_config_win32.h	Mon Mar 13 02:12:15 2006 +0000
+++ b/include/SDL_config_win32.h	Mon Mar 13 02:12:39 2006 +0000
@@ -103,6 +103,7 @@
 #define HAVE_STRCMP 1
 #define HAVE_STRNCMP 1
 #define HAVE__STRICMP 1
+#define HAVE__STRNICMP 1
 #define HAVE_SSCANF 1
 #else
 #define HAVE_STDARG_H	1
--- a/include/SDL_stdinc.h	Mon Mar 13 02:12:15 2006 +0000
+++ b/include/SDL_stdinc.h	Mon Mar 13 02:12:39 2006 +0000
@@ -523,6 +523,8 @@
 
 #if HAVE_STRNCASECMP
 #define SDL_strncasecmp strncasecmp
+#elif HAVE__STRNICMP
+#define SDL_strncasecmp _strnicmp
 #else
 extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen);
 #endif
--- a/src/stdlib/SDL_string.c	Mon Mar 13 02:12:15 2006 +0000
+++ b/src/stdlib/SDL_string.c	Mon Mar 13 02:12:39 2006 +0000
@@ -678,7 +678,7 @@
 }
 #endif
 
-#ifndef HAVE_STRNCASECMP
+#if !defined(HAVE_STRNCASECMP) && !defined(HAVE__STRNICMP)
 int SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen)
 {
     char a = 0;