summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-22 17:41:38 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-09-23 16:46:23 -0700
commit3d41939d0349569dcfd2aef9b846c739d0ba0060 (patch)
tree72c8167705f61218f7536e1019c22c5abbecdc4f
parent46d5ae5b551cc926331324073f2686b47e8aea07 (diff)
Unconditionally #include <stdint.h>
The more recent inclusions of this file haven't been checking for HAVE_STDINT_H, so might as well make the older ones consistent. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jamey Sharp <jamey@minilop.net>
-rw-r--r--Xext/xcmisc.c5
-rw-r--r--dbe/dbe.c5
-rw-r--r--include/dix-config.h.in3
-rw-r--r--render/render.c4
4 files changed, 0 insertions, 17 deletions
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 8e3c9cd80..745135ed5 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -40,12 +40,7 @@ from The Open Group.
#include <X11/extensions/xcmiscproto.h>
#include "modinit.h"
-#if HAVE_STDINT_H
#include <stdint.h>
-#elif !defined(UINT32_MAX)
-#define UINT32_MAX 0xffffffffU
-#endif
-
static int
ProcXCMiscGetVersion(ClientPtr client)
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 86d8220b8..a46867676 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -38,12 +38,7 @@
#endif
#include <string.h>
-#if HAVE_STDINT_H
#include <stdint.h>
-#elif !defined(UINT32_MAX)
-#define UINT32_MAX 0xffffffffU
-#endif
-
#include <X11/X.h>
#include <X11/Xproto.h>
#include "scrnintstr.h"
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 5facb1106..aa7de60bd 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -178,9 +178,6 @@
/* Define to 1 if you have the `shmctl64' function. */
#undef HAVE_SHMCTL64
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
diff --git a/render/render.c b/render/render.c
index cc13dbc2a..ff75409cb 100644
--- a/render/render.c
+++ b/render/render.c
@@ -52,11 +52,7 @@
#include "panoramiXsrv.h"
#endif
-#if HAVE_STDINT_H
#include <stdint.h>
-#elif !defined(UINT32_MAX)
-#define UINT32_MAX 0xffffffffU
-#endif
static int ProcRenderQueryVersion (ClientPtr pClient);
static int ProcRenderQueryPictFormats (ClientPtr pClient);