diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-12-16 07:18:11 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-16 07:18:24 +0100 |
| commit | e92c2a87808ec922b6bc90d5d5002ca77318f697 (patch) | |
| tree | fe4f6274ad211d11a269b689a0a855c28c706198 /nx-X11/programs/Xserver | |
| parent | 0d6207bd3fa4eaf13a58a21dbaa20193403c1cbc (diff) | |
| download | nx-libs-e92c2a87808ec922b6bc90d5d5002ca77318f697.tar.gz nx-libs-e92c2a87808ec922b6bc90d5d5002ca77318f697.tar.bz2 nx-libs-e92c2a87808ec922b6bc90d5d5002ca77318f697.zip | |
Support building with legacy (pre-7.1.0) Xext proto versions.
Legacy Xext proto versions are automatically detected by the main
Makefile.
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvdisp.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xvdisp.c b/nx-X11/programs/Xserver/Xext/xvdisp.c index b33bfa493..6f3e3729d 100644 --- a/nx-X11/programs/Xserver/Xext/xvdisp.c +++ b/nx-X11/programs/Xserver/Xext/xvdisp.c @@ -68,8 +68,12 @@ SOFTWARE. #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ +#ifdef LEGACY_XEXT_PROTO +#include <X11/extensions/XShm.h> +#else #include <X11/extensions/shmproto.h> #endif +#endif #include "xvdisp.h" diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index 6f6d67841..15466eea5 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -147,8 +147,12 @@ typedef void (*InitExtension)(void); #ifdef MITSHM #define _XSHM_SERVER_ +#ifdef LEGACY_XEXT_PROTO +#include <X11/extensions/XShm.h> +#else #include <X11/extensions/shmproto.h> #endif +#endif #ifdef XTEST #define _XTEST_SERVER_ #include <nx-X11/extensions/xtestconst.h> |