From 9bc6ff269aa8bf4c41696ebf4a686c93729ba151 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 1 Mar 2016 20:55:27 +0000
Subject: Drop X11 extensions not shipped with recent X.Org server versions
 anymore:

  include/extensions: Xag.h, Xagsrv.h, Xagstr.h
  Xserver/Xext: appgroup.c, appgroup.h
  lib/Xext: XAppgroup.c

  include/extensions: Xcup.h, Xcupstr.h,
  Xserver/Xext: cup.c
  lib/Xext: cup.c

  include/extensions: Xdbe.h
  Xserver/Xext: Xdbe.c

  Xserver/Xext:  dgaproc.h, xf86dga.c, xf86dga2.c, xf86dgaext.h

  include/extensions: Xevie.h, Xeviestr.h
  include/extensions: XEVI.h, XEVIstr.h
  Xserver/Xext: EVI.c, EVIstruct.h, sampleEVI.c
  lib/Xext: XEVI.c

  include/extensions: fontcache.h, fontcacheP.h, fontcachstr.h
  Xserver/Xext: fontcache.c

  include/extensions: lbxbuf.h, lbxbufstr.h, lbxdeltastr.h, lbximage.h, lbxopts.h, lbxstr.h, lbxzlib.h
  lib/Xext: XLbx.c

  include/extensions: multibuf.h, multibufst.h
  lib/Xext: XMultibuf.c
  Xserver/Xext: mbuf.c, mbufbf.c, mbufpx.c

  include/extensions: xf86vmode.h, xf86vmstr.h
  Xserver/Xext: vidmodeproc.h, xf86vmode.c

  lib/Xext: MITMisc.c
  Xserver/Xext: mitmisc.c

  Xserver/Xext: xf86misc.c, xf86miscproc.h

  Xserver/XTrap: xf86XTrapModule.c, xtrapddmi.c, xtrapdi.c, xtrapdiswp.c, xtrapditbl.c
  include/extensions: xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h xtraplibp.h xtrapproto.h
  Fixes: ArcticaProject/nx-libs#116
  X.org: https://cgit.freedesktop.org/xorg/xserver/commit/?id=cbc20d92de92aad5ca240310a9156ccf97c24a01

  Plus: Drop various Imake'ish defines where not needed anymore.
---
 nx-X11/programs/Xserver/Xext/xcmisc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'nx-X11/programs/Xserver/Xext/xcmisc.c')

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;
-- 
cgit v1.2.3