Fixed compiler warnings in Watcom C.
authorRyan C. Gordon <icculus@icculus.org>
Mon, 03 Oct 2005 08:12:32 +0000
changeset 1154 d93862a3d821
parent 1153 5bc98ce985c2
child 1155 91569ec25acd
Fixed compiler warnings in Watcom C.
test/testcdrom.c
test/testkeys.c
test/testtypes.c
test/testver.c
test/torturethread.c
--- a/test/testcdrom.c	Sun Oct 02 00:50:03 2005 +0000
+++ b/test/testcdrom.c	Mon Oct 03 08:12:32 2005 +0000
@@ -2,8 +2,9 @@
 /* Test the SDL CD-ROM audio functions */
 
 #include <stdlib.h>
-#include <stdio.h>
 #include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "SDL.h"
 
--- a/test/testkeys.c	Sun Oct 02 00:50:03 2005 +0000
+++ b/test/testkeys.c	Mon Oct 03 08:12:32 2005 +0000
@@ -3,6 +3,8 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "SDL.h"
 
--- a/test/testtypes.c	Sun Oct 02 00:50:03 2005 +0000
+++ b/test/testtypes.c	Mon Oct 03 08:12:32 2005 +0000
@@ -1,8 +1,20 @@
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "SDL_main.h"
 #include "SDL_types.h"
 
+/*
+ * Watcom C flags these as Warning 201: "Unreachable code" if you just
+ *  compare them directly, so we push it through a function to keep the
+ *  compiler quiet.  --ryan.
+ */
+static int badsize(size_t sizeoftype, size_t hardcodetype)
+{
+    return sizeoftype != hardcodetype;
+}
+
 int main(int argc, char *argv[])
 {
 	int error = 0;
@@ -11,26 +23,26 @@
 	if ( argv[1] && (strcmp(argv[1], "-q") == 0) )
 		verbose = 0;
 
-	if ( sizeof(Uint8) != 1 ) {
+	if ( badsize(sizeof(Uint8), 1) ) {
 		if ( verbose )
 			printf("sizeof(Uint8) != 1, instead = %d\n",
 								sizeof(Uint8));
 		++error;
 	}
-	if ( sizeof(Uint16) != 2 ) {
+	if ( badsize(sizeof(Uint16), 2) ) {
 		if ( verbose )
 			printf("sizeof(Uint16) != 2, instead = %d\n",
 								sizeof(Uint16));
 		++error;
 	}
-	if ( sizeof(Uint32) != 4 ) {
+	if ( badsize(sizeof(Uint32), 4) ) {
 		if ( verbose )
 			printf("sizeof(Uint32) != 4, instead = %d\n",
 								sizeof(Uint32));
 		++error;
 	}
 #ifdef SDL_HAS_64BIT_TYPE
-	if ( sizeof(Uint64) != 8 ) {
+	if ( badsize(sizeof(Uint64), 8) ) {
 		if ( verbose )
 			printf("sizeof(Uint64) != 8, instead = %d\n",
 								sizeof(Uint64));
--- a/test/testver.c	Sun Oct 02 00:50:03 2005 +0000
+++ b/test/testver.c	Mon Oct 03 08:12:32 2005 +0000
@@ -4,6 +4,7 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "SDL.h"
 
--- a/test/torturethread.c	Sun Oct 02 00:50:03 2005 +0000
+++ b/test/torturethread.c	Mon Oct 03 08:12:32 2005 +0000
@@ -22,7 +22,7 @@
 
 int SubThreadFunc(void *data) {
 	while(! *(int volatile *)data) {
-		; /*SDL_Delay(10); /* do nothing */
+		; /*SDL_Delay(10);*/  /* do nothing */
 	}
 	return 0;
 }