--- a/include/Makefile.am	Tue Mar 05 19:55:32 2002 +0000
+++ b/include/Makefile.am	Tue Mar 05 23:19:37 2002 +0000
@@ -21,6 +21,7 @@
 	SDL_main.h		\
 	SDL_mouse.h		\
 	SDL_mutex.h		\
+	SDL_name.h		\
 	SDL_opengl.h		\
 	SDL_quit.h		\
 	SDL_rwops.h		\

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/SDL_name.h	Tue Mar 05 23:19:37 2002 +0000
@@ -0,0 +1,13 @@
+
+#ifndef _SDLname_h_
+#define _SDLname_h_
+
+#if defined(__STDC__) || defined(__cplusplus)
+#define NeedFunctionPrototypes 1
+#endif
+
+#ifndef SDL_NAME
+#define SDL_NAME(X)	SDL_##X
+#endif
+
+#endif /* _SDLname_h_ */

--- a/src/video/Xext/extensions/SDLname.h	Tue Mar 05 19:55:32 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-
-#ifndef _SDLname_h_
-#define _SDLname_h_
-
-#define NeedFunctionPrototypes 1
-#define SDL_NAME(X)	SDL_##X
-
-#endif

--- a/src/video/Xext/extensions/Xinerama.h	Tue Mar 05 19:55:32 2002 +0000
+++ b/src/video/Xext/extensions/Xinerama.h	Tue Mar 05 23:19:37 2002 +0000
@@ -3,7 +3,7 @@
 #ifndef _Xinerama_h
 #define _Xinerama_h
 
-#include "SDLname.h"
+#include "SDL_name.h"
 
 typedef struct {
    int   screen_number;

--- a/src/video/Xext/extensions/Xvlib.h	Tue Mar 05 19:55:32 2002 +0000
+++ b/src/video/Xext/extensions/Xvlib.h	Tue Mar 05 23:19:37 2002 +0000
@@ -55,7 +55,7 @@
 
 #include <X11/Xfuncproto.h>
 #include <XFree86/extensions/Xv.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 typedef struct {
   int numerator;

--- a/src/video/Xext/extensions/panoramiXext.h	Tue Mar 05 19:55:32 2002 +0000
+++ b/src/video/Xext/extensions/panoramiXext.h	Tue Mar 05 23:19:37 2002 +0000
@@ -28,7 +28,7 @@
  */
 /* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */
 
-#include "SDLname.h"
+#include "SDL_name.h"
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 

--- a/src/video/Xext/extensions/xf86dga.h	Tue Mar 05 19:55:32 2002 +0000
+++ b/src/video/Xext/extensions/xf86dga.h	Tue Mar 05 23:19:37 2002 +0000
@@ -8,7 +8,7 @@
 
 #include <X11/Xfuncproto.h>
 #include <XFree86/extensions/xf86dga1.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XDGAQueryVersion		0
 

--- a/src/video/Xext/extensions/xf86dga1.h	Tue Mar 05 19:55:32 2002 +0000
+++ b/src/video/Xext/extensions/xf86dga1.h	Tue Mar 05 23:19:37 2002 +0000
@@ -16,7 +16,7 @@
 #define _XF86DGA1_H_
 
 #include <X11/Xfuncproto.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XF86DGAQueryVersion		0
 #define X_XF86DGAGetVideoLL		1

--- a/src/video/Xext/extensions/xf86vmode.h	Tue Mar 05 19:55:32 2002 +0000
+++ b/src/video/Xext/extensions/xf86vmode.h	Tue Mar 05 23:19:37 2002 +0000
@@ -37,7 +37,7 @@
 
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XF86VidModeQueryVersion	0
 #define X_XF86VidModeGetModeLine	1