Mercurial > sdl-ios-xcode
diff src/video/Xext/extensions/extutil.h @ 1168:045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
This allows you to run an SDL program on a system without Xlib, since it'll
just report the x11 target unavailable at runtime.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sat, 05 Nov 2005 19:53:37 +0000 |
| parents | eadc0746dfaf |
| children | c0a74f199ecf |
line wrap: on
line diff
--- a/src/video/Xext/extensions/extutil.h Sat Nov 05 17:41:11 2005 +0000 +++ b/src/video/Xext/extensions/extutil.h Sat Nov 05 19:53:37 2005 +0000 @@ -173,9 +173,9 @@ #define XextHasExtension(i) ((i) && ((i)->codes)) #define XextCheckExtension(dpy,i,name,val) \ - if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return val; } + if (!XextHasExtension(i)) { pXMissingExtension (dpy, name); return val; } #define XextSimpleCheckExtension(dpy,i,name) \ - if (!XextHasExtension(i)) { XMissingExtension (dpy, name); return; } + if (!XextHasExtension(i)) { pXMissingExtension (dpy, name); return; } /* @@ -188,9 +188,9 @@ XExtDisplayInfo *proc (Display *dpy) \ { \ XExtDisplayInfo *dpyinfo; \ - if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \ - if (!(dpyinfo = XextFindDisplay (extinfo, dpy))) \ - dpyinfo = XextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \ + if (!extinfo) { if (!(extinfo = pXextCreateExtension())) return NULL; } \ + if (!(dpyinfo = pXextFindDisplay (extinfo, dpy))) \ + dpyinfo = pXextAddDisplay (extinfo,dpy,extname,hooks,nev,data); \ return dpyinfo; \ } @@ -200,7 +200,7 @@ #define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \ int proc (Display *dpy, XExtCodes *codes) \ { \ - return XextRemoveDisplay (extinfo, dpy); \ + return pXextRemoveDisplay (extinfo, dpy); \ } #define XEXT_CLOSE_DISPLAY_PROTO(proc) \ @@ -213,7 +213,7 @@ if (code >= 0 && code < nerr) { \ char tmp[256]; \ sprintf (tmp, "%s.%d", extname, code); \ - XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \ + pXGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \ return buf; \ } \ return (char *)0; \