diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-12-23 08:01:10 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-12-23 08:01:10 +0000 |
| commit | b9cc6f8970e65a31ae21b1a4e459068c8b047832 (patch) | |
| tree | 0e1c265d822a703c876b2e5c93600155503e7021 /xserver | |
| parent | 87055d92256821751e9e1d22a3d2bbbcc4f7307e (diff) | |
Make that build with gcc 2.95
Diffstat (limited to 'xserver')
| -rw-r--r-- | xserver/hw/xnest/Args.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/xserver/hw/xnest/Args.c b/xserver/hw/xnest/Args.c index 5d0a0c02d..448d0d40a 100644 --- a/xserver/hw/xnest/Args.c +++ b/xserver/hw/xnest/Args.c @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> @@ -50,21 +49,28 @@ int xnestNumScreens = 0; Bool xnestDoDirectColormaps = False; Window xnestParentWindow = 0; +#ifdef COMPOSITE + /* XXX terrible hack */ + extern Bool noCompositeExtension; +#endif +#ifdef XKB + extern Bool noXkbExtension; +#endif + /* ddxInitGlobals - called by |InitGlobals| from os/util.c */ void ddxInitGlobals(void) { +#ifdef COMPOSITE + noCompositeExtension = TRUE; +#endif +#ifdef XKB + noXkbExtension = TRUE; +#endif } int ddxProcessArgument (int argc, char *argv[], int i) { - -#ifdef COMPOSITE - /* XXX terrible hack */ - extern Bool noCompositeExtension; - noCompositeExtension = TRUE; -#endif - if (!strcmp(argv[i], "-display")) { if (++i < argc) { xnestDisplayName = argv[i]; |