[PATCH] Unconditionally #include <stdint.h>

Alan Coopersmith alan.coopersmith at oracle.com
Thu Sep 22 17:55:33 PDT 2011


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 at oracle.com>
---
 Xext/xcmisc.c           |    5 -----
 dbe/dbe.c               |    5 -----
 include/dix-config.h.in |    3 ---
 render/render.c         |    4 ----
 4 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 8e3c9cd..745135e 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 86d8220..a468676 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 5facb11..aa7de60 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 cc13dbc..ff75409 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);
-- 
1.7.3.2



More information about the xorg-devel mailing list