diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-06-01 21:57:36 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-01 21:57:36 +0200 |
| commit | 3d54338330821a3e60e0f52cce2a9dd1f94f8b5c (patch) | |
| tree | e1d61f5f14cf5f26f3cf7094c485a5424f0551ea /nx-X11/programs/Xserver/Xext/xcmisc.c | |
| parent | c646808bcb0fe95e9794409231a9fa8b51990971 (diff) | |
| parent | b2145323c189a9c68d475d387fdfac54bcb33c94 (diff) | |
| download | nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.tar.gz nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.tar.bz2 nx-libs-3d54338330821a3e60e0f52cce2a9dd1f94f8b5c.zip | |
Merge branch 'sunweaver-pr/xserver-drop-outdated-xext-extensions' into arctica-3.6.x
Attributes GH PR #106: https://github.com/ArcticaProject/nx-libs/pull/106
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/xcmisc.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xcmisc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c index e353d65ac..ee7d69fc3 100644 --- a/nx-X11/programs/Xserver/Xext/xcmisc.c +++ b/nx-X11/programs/Xserver/Xext/xcmisc.c @@ -34,8 +34,8 @@ from The Open Group. #include <dix-config.h> #endif -#include <nx-X11/X.h> -#include <nx-X11/Xproto.h> +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -44,7 +44,11 @@ from The Open Group. #include <nx-X11/extensions/xcmiscstr.h> #include "modinit.h" +#if HAVE_STDINT_H #include <stdint.h> +#elif !defined(UINT32_MAX) +#define UINT32_MAX 0xffffffffU +#endif #if 0 static unsigned char XCMiscCode; |