Fixed dynamic X11 for now, I think.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401317
This commit is contained in:
Ryan C. Gordon 2006-02-01 08:03:04 +00:00
parent 2fb09900d2
commit 4c392943ac
2 changed files with 2 additions and 5 deletions

View file

@ -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

View file

@ -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 *))