From e52f3e311e711c979bde67dfb0983056e52e5947 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 4 Jan 2004 15:48:44 +0000
Subject: [PATCH] Date: Wed, 26 Nov 2003 01:52:02 +0800 From: "Andy Pfiffer"
 Subject: [SDL] patch: PocketPC 2000 diffs for release_1_2_6

I was making a backup of my current workspace of SDL for PocketPC,
and thought I would send out my diffs.

Apologies in advance if the patch has become whitespace mangled.

These diffs are relative to CVS tag release_1_2_6, and contain (I think)
all changes that have been mentioned on the mailing list in the last
few months.

I only have PocketPC 2000 & an ARM-based device (iPaq 3635), and I
only use Embedded Visual Tools 3.0, so I can't say for sure if it
breaks other PocketPC 200[023] builds.
---
 src/main/win32/SDL_win32_main.c | 7 ++++---
 src/video/wincommon/SDL_wingl.c | 2 ++
 src/video/windib/SDL_dibvideo.c | 5 ++++-
 test/testtimer.c                | 6 +++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/win32/SDL_win32_main.c b/src/main/win32/SDL_win32_main.c
index 38e375696..64866a793 100644
--- a/src/main/win32/SDL_win32_main.c
+++ b/src/main/win32/SDL_win32_main.c
@@ -14,9 +14,10 @@
 
 #ifdef _WIN32_WCE
 # define DIR_SEPERATOR TEXT("\\")
-# define _getcwd(str,len)	wcscpy(str,DIR_SEPERATOR);
-# define setbuf(x)
-# define setvbuf(x)
+# undef _getcwd
+# define _getcwd(str,len)	wcscpy(str,TEXT(""))
+# define setbuf(f,b)
+# define setvbuf(w,x,y,z)
 # define fopen		_wfopen
 # define freopen	_wfreopen
 # define remove(x)	DeleteFile(x)
diff --git a/src/video/wincommon/SDL_wingl.c b/src/video/wincommon/SDL_wingl.c
index 43e532b5d..ef6e0df1e 100644
--- a/src/video/wincommon/SDL_wingl.c
+++ b/src/video/wincommon/SDL_wingl.c
@@ -79,6 +79,7 @@ static int WIN_GL_ResetWindow(_THIS)
 	return(status);
 }
 
+#ifdef HAVE_OPENGL
 static void Init_WGL_ARB_extensions(_THIS)
 {
 	HWND hwnd;
@@ -127,6 +128,7 @@ static void Init_WGL_ARB_extensions(_THIS)
 	ReleaseDC(hwnd, hdc);
 	DestroyWindow(hwnd);
 }
+#endif /* !HAVE_OPENGL */
 
 int WIN_GL_SetupWindow(_THIS)
 {
diff --git a/src/video/windib/SDL_dibvideo.c b/src/video/windib/SDL_dibvideo.c
index 7249e637b..1242b30c2 100644
--- a/src/video/windib/SDL_dibvideo.c
+++ b/src/video/windib/SDL_dibvideo.c
@@ -58,7 +58,10 @@ static char rcsid =
 #define NO_GAMMA_SUPPORT
 #endif
 #ifndef WS_MAXIMIZE
-#define WS_MAXIMIZE		0
+#define WS_MAXIMIZE	0
+#endif
+#ifndef WS_THICKFRAME
+#define WS_THICKFRAME	0
 #endif
 #ifndef SWP_NOCOPYBITS
 #define SWP_NOCOPYBITS	0
diff --git a/test/testtimer.c b/test/testtimer.c
index f481b0510..c89cfee90 100644
--- a/test/testtimer.c
+++ b/test/testtimer.c
@@ -63,13 +63,13 @@ int main(int argc, char *argv[])
 	printf("Testing multiple timers...\n");
 	t1 = SDL_AddTimer(100, callback, (void*)1);
 	if(!t1)
-	  fprintf(stderr,"Could not create timer 1\n");
+	  fprintf(stderr,"Could not create timer 1: %s\n", SDL_GetError());
 	t2 = SDL_AddTimer(50, callback, (void*)2);
 	if(!t2)
-	  fprintf(stderr,"Could not create timer 2\n");
+	  fprintf(stderr,"Could not create timer 2: %s\n", SDL_GetError());
 	t3 = SDL_AddTimer(233, callback, (void*)3);
 	if(!t3)
-	  fprintf(stderr,"Could not create timer 3\n");
+	  fprintf(stderr,"Could not create timer 3: %s\n", SDL_GetError());
 	
 	/* Wait 10 seconds */
 	printf("Waiting 10 seconds\n");