diff src/video/svga/SDL_svgaevents.c @ 1402:d910939febfa

Use consistent identifiers for the various platforms we support. Make sure every source file includes SDL_config.h, so the proper system headers are chosen.
author Sam Lantinga <slouken@libsdl.org>
date Tue, 21 Feb 2006 08:46:50 +0000
parents c0a74f199ecf
children 782fd950bd46 c121d94672cb a1b03ba2fcd0
line wrap: on
line diff
--- a/src/video/svga/SDL_svgaevents.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/video/svga/SDL_svgaevents.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,16 +19,17 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* Handle the event stream, converting X11 events into SDL events */
 
 #include <vga.h>
 #include <vgamouse.h>
 #include <vgakeyboard.h>
-#if defined(linux)
+#if defined(__LINUX__)
 #include <linux/kd.h>
 #include <linux/keyboard.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FREEBSD__)
 #include <sys/kbio.h>
 #else
 #error You must choose your operating system here
@@ -43,7 +44,7 @@
 #if defined(linux)
 #define NUM_VGAKEYMAPS	(1<<KG_CAPSSHIFT)
 static Uint16 vga_keymap[NUM_VGAKEYMAPS][NR_KEYS];
-#elif defined(__FreeBSD__)
+#elif defined(__FREEBSD__)
 /* FIXME: Free the keymap when we shut down the video mode */
 static keymap_t *vga_keymap = NULL;
 #else
@@ -126,7 +127,7 @@
 	}
 	return(0);
 }
-#elif defined(__FreeBSD__)
+#elif defined(__FREEBSD__)
 int SVGA_initkeymaps(int fd)
 {
 	vga_keymap = SDL_malloc(sizeof(keymap_t));
@@ -374,7 +375,7 @@
 	}
 	return(keysym);
 }
-#elif defined(__FreeBSD__)
+#elif defined(__FREEBSD__)
 static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)
 {
 	/* Set the keysym information */