Mattias Engdeg?rd - Fri Mar 2 14:48:09 PST 2001

* Cleaned up some compiler warnings
libsdl-org · Mar 2, 2001 · 7b70e91 · 7b70e91
1 parent 6f107fb
commit 7b70e91
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,7 @@
 
 1.1.1:
+Mattias Engdeg�rd - Fri Mar  2 14:48:09 PST 2001
+ * Cleaned up some compiler warnings
 Mattias Engdeg�rd - Tue Feb 27 12:44:43 PST 2001
  * Improved the PCX loading code
  * Modified showimage to set hardware palette for 8-bit displays

diff --git a/IMG_jpg.c b/IMG_jpg.c
@@ -47,7 +47,7 @@ int IMG_isJPG(SDL_RWops *src)
 		if ( (magic[0] == 0xFF) && (magic[1] == 0xD8) ) {
 			SDL_RWread(src, magic, 4, 1);
 			SDL_RWread(src, magic, 4, 1);
-			if ( strncmp(magic, "JFIF", 4) == 0 ) {
+			if ( memcmp((char *)magic, "JFIF", 4) == 0 ) {
 				is_JPG = 1;
 			}
 		}

diff --git a/IMG_png.c b/IMG_png.c
@@ -76,7 +76,7 @@
 /* See if an image is contained in a data source */
 int IMG_isPNG(SDL_RWops *src)
 {
-   char buf[PNG_BYTES_TO_CHECK];
+   unsigned char buf[PNG_BYTES_TO_CHECK];
 
    /* Read in the signature bytes */
    if (SDL_RWread(src, buf, 1, PNG_BYTES_TO_CHECK) != PNG_BYTES_TO_CHECK)

diff --git a/IMG_xpm.c b/IMG_xpm.c
@@ -143,7 +143,7 @@ static int add_colorhash(struct color_hash *hash,
 }
 
 /* fast lookup that works if cpp == 1 */
-#define QUICK_COLORHASH(hash, key) ((hash)->table[*(key)]->color)
+#define QUICK_COLORHASH(hash, key) ((hash)->table[*(Uint8 *)(key)]->color)
 
 static Uint32 get_colorhash(struct color_hash *hash, const char *key, int cpp)
 {
@@ -388,7 +388,7 @@ SDL_Surface *IMG_LoadXPM_RW(SDL_RWops *src)
 	}
 	dst = image->pixels;
 	for (y = 0; y < h; ) {
-		Uint8 *s;
+		char *s;
 		char c;
 		do {
 			if(SDL_RWread(src, &c, 1, 1) <= 0) {

diff --git a/configure.in b/configure.in
@@ -49,6 +49,7 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
 AC_PROG_CC
+AC_C_INLINE
 AC_PROG_INSTALL
 
 dnl The alpha architecture needs special flags for binary portability