From 6b3e41c5c242494df34e65bf35fa9f8ab31d90cd Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Wed, 1 Feb 2006 08:03:04 +0000
Subject: [PATCH] Fixed dynamic X11 for now, I think.

---
 src/video/x11/SDL_x11dyn.h | 3 ---
 src/video/x11/SDL_x11sym.h | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/video/x11/SDL_x11dyn.h b/src/video/x11/SDL_x11dyn.h
index 0879a2120..c33ae1a2f 100644
--- a/src/video/x11/SDL_x11dyn.h
+++ b/src/video/x11/SDL_x11dyn.h
@@ -69,10 +69,7 @@ typedef int (*SDL_X11_XSetExtensionErrorHandlerType)(Display *,char *,char *);
 #define _XReply p_XReply
 #define _XSend p_XSend
 #define XFree pXFree
-
-#if !defined(__osf__) || defined(X11_DYNAMIC)
 #define _XData32 p_XData32
-#endif
 
 #if defined(__osf__) && defined(X11_DYNAMIC)
 #define _SmtBufferOverflow p_SmtBufferOverflow
diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
index c379854f2..29d2c989b 100644
--- a/src/video/x11/SDL_x11sym.h
+++ b/src/video/x11/SDL_x11sym.h
@@ -139,12 +139,12 @@ SDL_X11_SYM(1,unsigned long,_XSetLastRequestRead,(Display*,xGenericReply*))
  * These don't exist in 32-bit versions and are removed by Xlib macros, but
  *  64+ bit systems will use them.
  */
-#if defined(LONG64) && !defined(__osf__) || defined(X11_DYNAMIC)
+#if defined(LONG64) && !defined(__osf__)
 SDL_X11_SYM(1,int,_XData32,(Display *dpy,register long *data,unsigned len))
 SDL_X11_SYM(1,void,_XRead32,(Display *dpy,register long *data,long len))
 #endif
 
-#if defined(__osf__) && defined(X11_DYNAMIC)
+#if defined(__osf__)
 SDL_X11_SYM(1,void,_SmtBufferOverflow,(Display *dpy,register smtDisplayPtr))
 SDL_X11_SYM(1,void,_SmtIpError,(Display *dpy,register smtDisplayPtr, int))
 SDL_X11_SYM(1,int,ipAllocateData,(ChannelPtr, IPCard, IPDataPtr *))