Mercurial > sdl-ios-xcode
changeset 1314:2b3ebc327017
Fixed dynamic X11 for now, I think.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 01 Feb 2006 08:03:04 +0000 |
| parents | 09f0e1634b6d |
| children | e94b0d7c33bc |
| files | src/video/x11/SDL_x11dyn.h src/video/x11/SDL_x11sym.h |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11dyn.h Wed Feb 01 07:12:14 2006 +0000 +++ b/src/video/x11/SDL_x11dyn.h Wed Feb 01 08:03:04 2006 +0000 @@ -69,10 +69,7 @@ #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
--- a/src/video/x11/SDL_x11sym.h Wed Feb 01 07:12:14 2006 +0000 +++ b/src/video/x11/SDL_x11sym.h Wed Feb 01 08:03:04 2006 +0000 @@ -139,12 +139,12 @@ * 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 *))