Patch from Dmitry Yakimov to fix building on WinCE

libsdl-org · May 3, 2006 · a5fa128 · a5fa128
1 parent 23134fe
commit a5fa128
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/VisualCE.zip b/VisualCE.zip
diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h
@@ -115,7 +115,7 @@ typedef struct SDL_SysWMinfo {
 	GR_WINDOW_ID window ;	/* The display window */
 } SDL_SysWMinfo;
 
-#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW)
+#elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || defined(SDL_VIDEO_DRIVER_GAPI)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 

diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
@@ -59,7 +59,7 @@ int SDL_KeyboardInit(void)
 
 	/* Initialize the tables */
 	SDL_ModState = KMOD_NONE;
-	SDL_memset(keynames, 0, sizeof(keynames));
+	SDL_memset((void*)keynames, 0, sizeof(keynames));
 	SDL_memset(SDL_KeyState, 0, sizeof(SDL_KeyState));
 	video->InitOSKeymap(this);
 

diff --git a/test/testwin.c b/test/testwin.c
@@ -250,9 +250,9 @@ int main(int argc, char *argv[])
 	delay = 1;
 
 #ifdef _WIN32_WCE
-	w = 640;
+	w = 240;
 	h = 320;
-	desired_bpp = 0;
+	desired_bpp = 8;
 	video_flags = SDL_FULLSCREEN;
 #else
 	w = 640;