Fixed dynamic X11 for now, I think.
authorRyan C. Gordon
Wed, 01 Feb 2006 08:03:04 +0000
changeset 13142b3ebc327017
parent 1313 09f0e1634b6d
child 1315 e94b0d7c33bc
Fixed dynamic X11 for now, I think.
src/video/x11/SDL_x11dyn.h
src/video/x11/SDL_x11sym.h
     1.1 --- a/src/video/x11/SDL_x11dyn.h	Wed Feb 01 07:12:14 2006 +0000
     1.2 +++ b/src/video/x11/SDL_x11dyn.h	Wed Feb 01 08:03:04 2006 +0000
     1.3 @@ -69,10 +69,7 @@
     1.4  #define _XReply p_XReply
     1.5  #define _XSend p_XSend
     1.6  #define XFree pXFree
     1.7 -
     1.8 -#if !defined(__osf__) || defined(X11_DYNAMIC)
     1.9  #define _XData32 p_XData32
    1.10 -#endif
    1.11  
    1.12  #if defined(__osf__) && defined(X11_DYNAMIC)
    1.13  #define _SmtBufferOverflow p_SmtBufferOverflow
     2.1 --- a/src/video/x11/SDL_x11sym.h	Wed Feb 01 07:12:14 2006 +0000
     2.2 +++ b/src/video/x11/SDL_x11sym.h	Wed Feb 01 08:03:04 2006 +0000
     2.3 @@ -139,12 +139,12 @@
     2.4   * These don't exist in 32-bit versions and are removed by Xlib macros, but
     2.5   *  64+ bit systems will use them.
     2.6   */
     2.7 -#if defined(LONG64) && !defined(__osf__) || defined(X11_DYNAMIC)
     2.8 +#if defined(LONG64) && !defined(__osf__)
     2.9  SDL_X11_SYM(1,int,_XData32,(Display *dpy,register long *data,unsigned len))
    2.10  SDL_X11_SYM(1,void,_XRead32,(Display *dpy,register long *data,long len))
    2.11  #endif
    2.12  
    2.13 -#if defined(__osf__) && defined(X11_DYNAMIC)
    2.14 +#if defined(__osf__)
    2.15  SDL_X11_SYM(1,void,_SmtBufferOverflow,(Display *dpy,register smtDisplayPtr))
    2.16  SDL_X11_SYM(1,void,_SmtIpError,(Display *dpy,register smtDisplayPtr, int))
    2.17  SDL_X11_SYM(1,int,ipAllocateData,(ChannelPtr, IPCard, IPDataPtr *))