Commit 00fcbc74 authored by Sam Lantinga's avatar Sam Lantinga

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

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403962
parent 4968cb27
#include <stdio.h>
#include "SDL.h" #include "SDL.h"
/* Make sure we have good macros for printing 32 and 64 bit values */ /* Make sure we have good macros for printing 32 and 64 bit values */
...@@ -17,7 +18,7 @@ ...@@ -17,7 +18,7 @@
after calling each function. after calling each function.
*/ */
char * char *
tf(SDL_bool tf) tf(SDL_bool tf)
{ {
static char *t = "true"; static char *t = "true";
...@@ -30,7 +31,7 @@ tf(SDL_bool tf) ...@@ -30,7 +31,7 @@ tf(SDL_bool tf)
return f; return f;
} }
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
......
#include <stdio.h>
#include "SDL.h" #include "SDL.h"
static void static void
......
...@@ -14,6 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ...@@ -14,6 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
/* /*
* includes * includes
*/ */
#include <stdlib.h>
#include "SDL.h" #include "SDL.h"
#include "SDL_haptic.h" #include "SDL_haptic.h"
......
/* A simple program to test the Input Method support in the SDL library (1.3+) */ /* A simple program to test the Input Method support in the SDL library (1.3+) */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#ifdef HAVE_SDL_TTF #ifdef HAVE_SDL_TTF
#include "SDL_ttf.h" #include "SDL_ttf.h"
#endif #endif
#define DEFAULT_PTSIZE 30 #define DEFAULT_PTSIZE 30
#define DEFAULT_FONT "/System/Library/Fonts/华文细黑.ttf" #define DEFAULT_FONT "/System/Library/Fonts/华文细黑.ttf"
#define MAX_TEXT_LENGTH 256 #define MAX_TEXT_LENGTH 256
...@@ -210,13 +210,13 @@ HotKey_ToggleFullScreen(void) ...@@ -210,13 +210,13 @@ HotKey_ToggleFullScreen(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
SDL_Event event;
int done = 0;
InitVideo(argc, argv); InitVideo(argc, argv);
InitInput(); InitInput();
Redraw(); Redraw();
SDL_Event event;
int done = 0;
while (! done && SDL_WaitEvent(&event)) while (! done && SDL_WaitEvent(&event))
{ {
switch (event.type) switch (event.type)
......
/* Test program to test dynamic loading with the loadso subsystem. /* Test program to test dynamic loading with the loadso subsystem.
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "SDL.h" #include "SDL.h"
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <time.h> #include <time.h>
#include <math.h> #include <math.h>
......
...@@ -52,6 +52,8 @@ main(int argc, char *argv[]) ...@@ -52,6 +52,8 @@ main(int argc, char *argv[])
} }
} }
quit(0); quit(0);
// keep the compiler happy ...
return(0);
} }
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment