diff src/video/x11/SDL_x11video.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 8d9bb0cf2c2a
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.c	Tue Feb 21 08:34:45 2006 +0000
+++ b/src/video/x11/SDL_x11video.c	Tue Feb 21 08:46:50 2006 +0000
@@ -19,6 +19,7 @@
     Sam Lantinga
     slouken@libsdl.org
 */
+#include "SDL_config.h"
 
 /* X11 based SDL video driver implementation.
    Note:  This implementation does not currently need X11 thread locking,
@@ -266,7 +267,7 @@
 static char *get_classname(char *classname, int maxlen)
 {
 	char *spot;
-#if defined(linux) || defined(__FreeBSD__)
+#if defined(__LINUX__) || defined(__FREEBSD__)
 	char procfile[1024];
 	char linkfile[1024];
 	int linksize;
@@ -280,10 +281,10 @@
 	}
 
 	/* Next look at the application's executable name */
-#if defined(linux) || defined(__FreeBSD__)
-#if defined(linux)
+#if defined(__LINUX__) || defined(__FREEBSD__)
+#if defined(__LINUX__)
 	SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/exe", getpid());
-#elif defined(__FreeBSD__)
+#elif defined(__FREEBSD__)
 	SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/file", getpid());
 #else
 #error Where can we find the executable name?
@@ -299,7 +300,7 @@
 		}
 		return classname;
 	}
-#endif /* linux */
+#endif /* __LINUX__ */
 
 	/* Finally use the default we've used forever */
 	SDL_strlcpy(classname, "SDL_App", maxlen);