From 421c0021612445613fcaf29bdefe65ad17da98f6 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 13 Mar 2006 02:12:39 +0000 Subject: [PATCH] Added _strnicmp support --- configure.in | 2 +- include/SDL_config.h.in | 1 + include/SDL_config_win32.h | 1 + include/SDL_stdinc.h | 2 ++ src/stdlib/SDL_string.c | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index cbc24c63c..043798fbe 100644 --- a/configure.in +++ b/configure.in @@ -116,7 +116,7 @@ if test x$enable_libc = xyes; then 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 diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 9d6ac89d1..ed99dcfd2 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -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 diff --git a/include/SDL_config_win32.h b/include/SDL_config_win32.h index dd25d7d0e..552905084 100644 --- a/include/SDL_config_win32.h +++ b/include/SDL_config_win32.h @@ -103,6 +103,7 @@ typedef unsigned int uintptr_t; #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 diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h index 7aaae3a42..9f20f5c68 100644 --- a/include/SDL_stdinc.h +++ b/include/SDL_stdinc.h @@ -523,6 +523,8 @@ extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2); #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 diff --git a/src/stdlib/SDL_string.c b/src/stdlib/SDL_string.c index 120c7896a..3f2a1e280 100644 --- a/src/stdlib/SDL_string.c +++ b/src/stdlib/SDL_string.c @@ -678,7 +678,7 @@ int SDL_strcasecmp(const char *str1, const char *str2) } #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;