*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40294

include/Makefile.am

@@ -21,6 +21,7 @@ libSDLinclude_HEADERS =		\
 	SDL_main.h		\
 	SDL_mouse.h		\
 	SDL_mutex.h		\
+	SDL_name.h		\
 	SDL_opengl.h		\
 	SDL_quit.h		\
 	SDL_rwops.h		\

include/SDL_name.h

@@ -2,7 +2,12 @@
 #ifndef _SDLname_h_
 #define _SDLname_h_
 
+#if defined(__STDC__) || defined(__cplusplus)
 #define NeedFunctionPrototypes 1
-#define SDL_NAME(X)	SDL_##X
-
 #endif
+
+#ifndef SDL_NAME
+#define SDL_NAME(X)	SDL_##X
+#endif
+
+#endif /* _SDLname_h_ */

src/video/Xext/extensions/Xinerama.h

@@ -3,7 +3,7 @@
 #ifndef _Xinerama_h
 #define _Xinerama_h
 
-#include "SDLname.h"
+#include "SDL_name.h"
 
 typedef struct {
    int   screen_number;

src/video/Xext/extensions/Xvlib.h

@@ -55,7 +55,7 @@ SOFTWARE.
 
 #include <X11/Xfuncproto.h>
 #include <XFree86/extensions/Xv.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 typedef struct {
   int numerator;

src/video/Xext/extensions/panoramiXext.h

@@ -28,7 +28,7 @@ Equipment Corporation.
  */
 /* $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 */
 

src/video/Xext/extensions/xf86dga.h

@@ -8,7 +8,7 @@
 
 #include <X11/Xfuncproto.h>
 #include <XFree86/extensions/xf86dga1.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XDGAQueryVersion		0
 

src/video/Xext/extensions/xf86dga1.h

@@ -16,7 +16,7 @@ Copyright (c) 1995  XFree86 Inc
 #define _XF86DGA1_H_
 
 #include <X11/Xfuncproto.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XF86DGAQueryVersion		0
 #define X_XF86DGAGetVideoLL		1

src/video/Xext/extensions/xf86vmode.h

@@ -37,7 +37,7 @@ from Kaleb S. KEITHLEY
 
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>
-#include "SDLname.h"
+#include "SDL_name.h"
 
 #define X_XF86VidModeQueryVersion	0
 #define X_XF86VidModeGetModeLine	1