Fixed bug #817

Daniele Forghieri 2009-09-30 15:48:24 PDT Some tests doesn't use the correct include statement (and there are some missing declaration) and some test use C++ variable after statement, preventing compile wicth Open Watcom The patch attached fixes this
libsdl-org · Oct 4, 2009 · 59224fd · 59224fd
1 parent a6a7984
commit 59224fd
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/test/testatomic.c b/test/testatomic.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "SDL.h"
 
 /* Make sure we have good macros for printing 32 and 64 bit values */
@@ -17,7 +18,7 @@
   after calling each function.
 */
 
-char * 
+char *
 tf(SDL_bool tf)
 {
    static char *t = "true";
@@ -30,7 +31,7 @@ tf(SDL_bool tf)
 
    return f;
 }
-  
+
 int
 main(int argc, char *argv[])
 {

diff --git a/test/testaudioinfo.c b/test/testaudioinfo.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "SDL.h"
 
 static void

diff --git a/test/testhaptic.c b/test/testhaptic.c
@@ -14,6 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 /*
  * includes
  */
+#include <stdlib.h>
 #include "SDL.h"
 #include "SDL_haptic.h"
 

diff --git a/test/testime.c b/test/testime.c
@@ -1,5 +1,5 @@
 /* A simple program to test the Input Method support in the SDL library (1.3+) */
- 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -8,7 +8,7 @@
 #ifdef HAVE_SDL_TTF
 #include "SDL_ttf.h"
 #endif
- 
+
 #define DEFAULT_PTSIZE  30
 #define DEFAULT_FONT    "/System/Library/Fonts/华文细黑.ttf"
 #define MAX_TEXT_LENGTH 256
@@ -210,13 +210,13 @@ HotKey_ToggleFullScreen(void)
 
 int main(int argc, char *argv[])
 {
+    SDL_Event event;
+    int done = 0;
+
     InitVideo(argc, argv);
     InitInput();
     Redraw();
 
-    SDL_Event event;
-    int done = 0;
-
     while (! done && SDL_WaitEvent(&event))
     {
         switch (event.type)

diff --git a/test/testloadso.c b/test/testloadso.c
@@ -1,9 +1,10 @@
 
-/* Test program to test dynamic loading with the loadso subsystem. 
+/* Test program to test dynamic loading with the loadso subsystem.
 */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "SDL.h"
 

diff --git a/test/testsprite.c b/test/testsprite.c
@@ -2,6 +2,8 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#include <ctype.h>
 #include <time.h>
 #include <math.h>
 

diff --git a/test/testwm2.c b/test/testwm2.c
@@ -52,6 +52,8 @@ main(int argc, char *argv[])
         }
     }
     quit(0);
+	// keep the compiler happy ...
+	return(0);
 }
 
 /* vi: set ts=4 sw=4 expandtab: */