Removed dependencies on standard C runtime

libsdl-org · Jun 15, 2015 · e5b7d17 · e5b7d17
1 parent bfbc062
commit e5b7d17
Show file tree

Hide file tree

Showing 5 changed files with 4,944 additions and 4,939 deletions.
diff --git a/IMG.c b/IMG.c
@@ -128,7 +128,7 @@ void IMG_Quit()
 SDL_Surface *IMG_Load(const char *file)
 {
     SDL_RWops *src = SDL_RWFromFile(file, "rb");
-    const char *ext = strrchr(file, '.');
+    const char *ext = SDL_strrchr(file, '.');
     if(ext) {
         ext++;
     }
@@ -150,8 +150,8 @@ SDL_Surface *IMG_Load_RW(SDL_RWops *src, int freesrc)
 static int IMG_string_equals(const char *str1, const char *str2)
 {
     while ( *str1 && *str2 ) {
-        if ( toupper((unsigned char)*str1) !=
-             toupper((unsigned char)*str2) )
+        if ( SDL_toupper((unsigned char)*str1) !=
+             SDL_toupper((unsigned char)*str2) )
             break;
         ++str1;
         ++str2;

diff --git a/IMG_lbm.c b/IMG_lbm.c
@@ -383,7 +383,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src )
 
                 for ( i=0; i < size; i++ )
                 {
-                    memset( ptr, 0, 8 );
+                    SDL_memset( ptr, 0, 8 );
 
                     for ( plane=0; plane < (nbplanes + stencil); plane++ )
                     {

diff --git a/IMG_pnm.c b/IMG_pnm.c
@@ -88,7 +88,7 @@ static int ReadNumber(SDL_RWops *src)
                 }
             } while ( (ch != '\r') && (ch != '\n') );
         }
-    } while ( isspace(ch) );
+    } while ( SDL_isspace(ch) );
 
     /* Add up the number */
     do {
@@ -98,7 +98,7 @@ static int ReadNumber(SDL_RWops *src)
         if ( !SDL_RWread(src, &ch, 1, 1) ) {
             return -1;
         }
-    } while ( isdigit(ch) );
+    } while ( SDL_isdigit(ch) );
 
     return(number);
 }

diff --git a/IMG_xpm.c b/IMG_xpm.c
@@ -122,7 +122,7 @@ static struct color_hash *create_colorhash(int maxnum)
         SDL_free(hash);
         return NULL;
     }
-    memset(hash->table, 0, bytes);
+    SDL_memset(hash->table, 0, bytes);
     hash->entries = (struct hash_entry *)SDL_malloc(maxnum * sizeof(struct hash_entry));
     if (!hash->entries) {
         SDL_free(hash->table);
@@ -888,7 +888,7 @@ static int color_to_rgb(char *spec, int speclen, Uint32 *rgb)
             break;
         }
         buf[6] = '\0';
-        *rgb = strtol(buf, NULL, 16);
+        *rgb = SDL_strtol(buf, NULL, 16);
         return 1;
     } else {
         int i;