Procházet zdrojové kódy

_uitoa does not exist

(cherry picked from commit 08e338f45c583ad0af3169bf2cc31260b1a5d91b)
Anonymous Maarten před 19 hodinami
rodič
revize
452348acf8

+ 1 - 1
CMakeLists.txt

@@ -1097,7 +1097,7 @@ if(SDL_LIBC)
   )
   if(WINDOWS)
     list(APPEND symbols_to_check
-      _copysign _fseeki64 _strrev _ui64toa _uitoa _ultoa _wcsdup
+      _copysign _fseeki64 _strrev _ui64toa _ultoa _wcsdup
     )
   else()
     list(APPEND symbols_to_check

+ 0 - 1
cmake/PreseedEmscriptenCache.cmake

@@ -132,7 +132,6 @@ if(EMSCRIPTEN)
     set(LIBC_HAS__LTOA                                   ""    CACHE INTERNAL "Have symbol _ltoa")
     set(LIBC_HAS__STRREV                                 ""    CACHE INTERNAL "Have symbol _strrev")
     set(LIBC_HAS__UI64TOA                                ""    CACHE INTERNAL "Have symbol _ui64toa")
-    set(LIBC_HAS__UITOA                                  ""    CACHE INTERNAL "Have symbol _uitoa")
     set(LIBC_HAS__ULTOA                                  ""    CACHE INTERNAL "Have symbol _ultoa")
     set(LIBC_HAS__WCSDUP                                 ""    CACHE INTERNAL "Have symbol _wcsdup")
     set(LIBC_IS_GLIBC                                    ""    CACHE INTERNAL "Have symbol __GLIBC__")

+ 0 - 1
cmake/PreseedMSVCCache.cmake

@@ -154,7 +154,6 @@ if(MSVC)
       set(LIBC_HAS__LTOA                                   "1"   CACHE INTERNAL "Have symbol _ltoa")
       set(LIBC_HAS__STRREV                                 "1"   CACHE INTERNAL "Have symbol _strrev")
       set(LIBC_HAS__UI64TOA                                "1"   CACHE INTERNAL "Have symbol _ui64toa")
-      set(LIBC_HAS__UITOA                                  ""    CACHE INTERNAL "Have symbol _uitoa")
       set(LIBC_HAS__ULTOA                                  "1"   CACHE INTERNAL "Have symbol _ultoa")
       set(LIBC_HAS__WCSDUP                                 "1"   CACHE INTERNAL "Have symbol _wcsdup")
       set(LIBC_IS_GLIBC                                    ""    CACHE INTERNAL "Have symbol __GLIBC__")

+ 0 - 1
cmake/PreseedNokiaNGageCache.cmake

@@ -135,7 +135,6 @@ if(NGAGESDK)
     set(LIBC_HAS__LTOA                                   ""    CACHE INTERNAL "Have symbol _ltoa")
     set(LIBC_HAS__STRREV                                 ""    CACHE INTERNAL "Have symbol _strrev")
     set(LIBC_HAS__UI64TOA                                ""    CACHE INTERNAL "Have symbol _ui64toa")
-    set(LIBC_HAS__UITOA                                  ""    CACHE INTERNAL "Have symbol _uitoa")
     set(LIBC_HAS__ULTOA                                  ""    CACHE INTERNAL "Have symbol _ultoa")
     set(LIBC_HAS__WCSDUP                                 ""    CACHE INTERNAL "Have symbol _wcsdup")
     set(LIBC_IS_GLIBC                                    ""    CACHE INTERNAL "Have symbol __GLIBC__")

+ 0 - 1
include/build_config/SDL_build_config.h.cmake

@@ -107,7 +107,6 @@
 #cmakedefine HAVE_STRTOK_R 1
 #cmakedefine HAVE_ITOA 1
 #cmakedefine HAVE__LTOA 1
-#cmakedefine HAVE__UITOA 1
 #cmakedefine HAVE__ULTOA 1
 #cmakedefine HAVE_STRTOL 1
 #cmakedefine HAVE_STRTOUL 1

+ 5 - 9
src/stdlib/SDL_string.c

@@ -1153,6 +1153,11 @@ static const char ntoa_table[] = {
 };
 #endif // ntoa() conversion table
 
+char *SDL_uitoa(unsigned int value, char *string, int radix)
+{
+    return SDL_ultoa((unsigned long)value, string, radix);
+}
+
 char *SDL_itoa(int value, char *string, int radix)
 {
 #ifdef HAVE_ITOA
@@ -1162,15 +1167,6 @@ char *SDL_itoa(int value, char *string, int radix)
 #endif // HAVE_ITOA
 }
 
-char *SDL_uitoa(unsigned int value, char *string, int radix)
-{
-#ifdef HAVE__UITOA
-    return _uitoa(value, string, radix);
-#else
-    return SDL_ultoa((unsigned long)value, string, radix);
-#endif // HAVE__UITOA
-}
-
 char *SDL_ltoa(long value, char *string, int radix)
 {
 #ifdef HAVE__LTOA