mirror of
https://github.com/Ryujinx/SDL.git
synced 2024-12-23 05:35:36 +00:00
Added SDL_wcscmp()
This commit is contained in:
parent
af9ec8f6b5
commit
f1829d956f
|
@ -623,6 +623,7 @@ if(LIBC)
|
||||||
set(HAVE_SIGNAL_H 1)
|
set(HAVE_SIGNAL_H 1)
|
||||||
foreach(_FN
|
foreach(_FN
|
||||||
malloc calloc realloc free qsort abs memset memcpy memmove memcmp
|
malloc calloc realloc free qsort abs memset memcpy memmove memcmp
|
||||||
|
wcslen wcslcpy wcslcat wcscmp
|
||||||
strlen _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa
|
strlen _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa
|
||||||
_ultoa strtol strtoul strtoll strtod atoi atof strcmp strncmp
|
_ultoa strtol strtoul strtoll strtod atoi atof strcmp strncmp
|
||||||
_stricmp _strnicmp sscanf atan atan2 acos asin ceil copysign cos
|
_stricmp _strnicmp sscanf atan atan2 acos asin ceil copysign cos
|
||||||
|
|
2
configure
vendored
2
configure
vendored
|
@ -16631,7 +16631,7 @@ fi
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for ac_func in 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 fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval
|
for ac_func in malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove wcslen wcslcpy wcslcat wcscmp 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 fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval
|
||||||
do :
|
do :
|
||||||
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
||||||
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
||||||
|
|
|
@ -268,7 +268,7 @@ if test x$enable_libc = xyes; then
|
||||||
AC_DEFINE(HAVE_MPROTECT, 1, [ ])
|
AC_DEFINE(HAVE_MPROTECT, 1, [ ])
|
||||||
]),
|
]),
|
||||||
)
|
)
|
||||||
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 fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval)
|
AC_CHECK_FUNCS(malloc calloc realloc free getenv setenv putenv unsetenv qsort abs bcopy memset memcpy memmove wcslen wcslcpy wcslcat wcscmp 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 fopen64 fseeko fseeko64 sigaction setjmp nanosleep sysconf sysctlbyname getauxval)
|
||||||
|
|
||||||
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 sqrtf tan tanf)
|
AC_CHECK_FUNCS(atan atan2 acos asin ceil copysign cos cosf fabs floor log pow scalbn sin sinf sqrt sqrtf tan tanf)
|
||||||
|
|
|
@ -106,6 +106,10 @@
|
||||||
#cmakedefine HAVE_MEMCPY 1
|
#cmakedefine HAVE_MEMCPY 1
|
||||||
#cmakedefine HAVE_MEMMOVE 1
|
#cmakedefine HAVE_MEMMOVE 1
|
||||||
#cmakedefine HAVE_MEMCMP 1
|
#cmakedefine HAVE_MEMCMP 1
|
||||||
|
#cmakedefine HAVE_WCSLEN 1
|
||||||
|
#cmakedefine HAVE_WCSLCPY 1
|
||||||
|
#cmakedefine HAVE_WCSLCAT 1
|
||||||
|
#cmakedefine HAVE_WCSCMP 1
|
||||||
#cmakedefine HAVE_STRLEN 1
|
#cmakedefine HAVE_STRLEN 1
|
||||||
#cmakedefine HAVE_STRLCPY 1
|
#cmakedefine HAVE_STRLCPY 1
|
||||||
#cmakedefine HAVE_STRLCAT 1
|
#cmakedefine HAVE_STRLCAT 1
|
||||||
|
|
|
@ -106,6 +106,10 @@
|
||||||
#undef HAVE_MEMCPY
|
#undef HAVE_MEMCPY
|
||||||
#undef HAVE_MEMMOVE
|
#undef HAVE_MEMMOVE
|
||||||
#undef HAVE_MEMCMP
|
#undef HAVE_MEMCMP
|
||||||
|
#undef HAVE_WCSLEN
|
||||||
|
#undef HAVE_WCSLCPY
|
||||||
|
#undef HAVE_WCSLCAT
|
||||||
|
#undef HAVE_WCSCMP
|
||||||
#undef HAVE_STRLEN
|
#undef HAVE_STRLEN
|
||||||
#undef HAVE_STRLCPY
|
#undef HAVE_STRLCPY
|
||||||
#undef HAVE_STRLCAT
|
#undef HAVE_STRLCAT
|
||||||
|
|
|
@ -404,6 +404,7 @@ extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t le
|
||||||
extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr);
|
extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr);
|
||||||
extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen);
|
extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen);
|
||||||
extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen);
|
extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen);
|
||||||
|
extern DECLSPEC int SDLCALL SDL_wcscmp(const wchar_t *str1, const wchar_t *str2);
|
||||||
|
|
||||||
extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str);
|
extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str);
|
||||||
extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen);
|
extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen);
|
||||||
|
|
|
@ -626,3 +626,4 @@
|
||||||
#define SDL_JoystickGetDeviceInstanceID SDL_JoystickGetDeviceInstanceID_REAL
|
#define SDL_JoystickGetDeviceInstanceID SDL_JoystickGetDeviceInstanceID_REAL
|
||||||
#define SDL_utf8strlen SDL_utf8strlen_REAL
|
#define SDL_utf8strlen SDL_utf8strlen_REAL
|
||||||
#define SDL_LoadFile_RW SDL_LoadFile_RW_REAL
|
#define SDL_LoadFile_RW SDL_LoadFile_RW_REAL
|
||||||
|
#define SDL_wcscmp SDL_wcscmp_REAL
|
||||||
|
|
|
@ -658,3 +658,4 @@ SDL_DYNAPI_PROC(void,SDL_MemoryBarrierAcquireFunction,(void),(),)
|
||||||
SDL_DYNAPI_PROC(SDL_JoystickID,SDL_JoystickGetDeviceInstanceID,(int a),(a),return)
|
SDL_DYNAPI_PROC(SDL_JoystickID,SDL_JoystickGetDeviceInstanceID,(int a),(a),return)
|
||||||
SDL_DYNAPI_PROC(size_t,SDL_utf8strlen,(const char *a),(a),return)
|
SDL_DYNAPI_PROC(size_t,SDL_utf8strlen,(const char *a),(a),return)
|
||||||
SDL_DYNAPI_PROC(void*,SDL_LoadFile_RW,(SDL_RWops *a, size_t *b, int c),(a,b,c),return)
|
SDL_DYNAPI_PROC(void*,SDL_LoadFile_RW,(SDL_RWops *a, size_t *b, int c),(a,b,c),return)
|
||||||
|
SDL_DYNAPI_PROC(int,SDL_wcscmp,(const wchar_t *a, const wchar_t *b),(a,b),return)
|
||||||
|
|
|
@ -461,6 +461,22 @@ SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t max
|
||||||
#endif /* HAVE_WCSLCAT */
|
#endif /* HAVE_WCSLCAT */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
SDL_wcscmp(const wchar_t *str1, const wchar_t *str2)
|
||||||
|
{
|
||||||
|
#if defined(HAVE_WCSCMP)
|
||||||
|
return wcscmp(str1, str2);
|
||||||
|
#else
|
||||||
|
while (*str1 && *str2) {
|
||||||
|
if (*str1 != *str2)
|
||||||
|
break;
|
||||||
|
++str1;
|
||||||
|
++str2;
|
||||||
|
}
|
||||||
|
return (int)(*str1 - *str2);
|
||||||
|
#endif /* HAVE_WCSCMP */
|
||||||
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen)
|
SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen)
|
||||||
{
|
{
|
||||||
|
@ -925,7 +941,7 @@ SDL_strcmp(const char *str1, const char *str2)
|
||||||
++str1;
|
++str1;
|
||||||
++str2;
|
++str2;
|
||||||
}
|
}
|
||||||
return (int) ((unsigned char) *str1 - (unsigned char) *str2);
|
return (int)((unsigned char) *str1 - (unsigned char) *str2);
|
||||||
#endif /* HAVE_STRCMP */
|
#endif /* HAVE_STRCMP */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue