gallium: Provide alternative stdint.h and stdbool.h C99 headers, instead of ad-hoc...

Everybody is using the C99's integer types. Everybody except Microsoft,
which in turns means everybody is including their own definitions of C99
integer types for MSVC, causing duplicate definitions when linking two
projects. This is the case of building Gallium and LLVM with MSVC.

Shipping alternative stdint.h and stdbool.h headers for MSVC allows us
to share a single definition. It also removes clutter from the Gallium
headers.

diff --git a/SConstruct b/SConstruct
index 787ff6e2d6b3e1d28a01cb0031031c3032681f22..5f6933eadff31ae193ab55899978c46c6984b859 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -97,6 +97,9 @@ env.Append(CPPPATH = [
        '#/src/gallium/drivers',
 ])
 
+if env['msvc']:
+    env.Append(CPPPATH = ['#include/c99'])
+
 
 # Posix
 if platform in ('posix', 'linux', 'freebsd', 'darwin'):

diff --git a/include/c99/stdbool.h b/include/c99/stdbool.h
new file mode 100644 (file)
index 0000000..99a735d
--- /dev/null
+++ b/include/c99/stdbool.h
@@ -0,0 +1,46 @@
+/**************************************************************************
+ *
+ * Copyright 2007-2010 VMware, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ **************************************************************************/
+
+#ifndef _STDBOOL_H_
+#define _STDBOOL_H_
+
+#ifndef __cplusplus
+
+#define false   0
+#define true    1
+#define bool    _Bool
+
+/* For compilers that don't have the builtin _Bool type. */
+#if defined(_MSC_VER) || (__STDC_VERSION__ < 199901L && __GNUC__ < 3)
+typedef unsigned char _Bool;
+#endif
+
+#endif /* !__cplusplus */
+
+#define __bool_true_false_are_defined   1
+
+#endif /* !_STDBOOL_H_ */

diff --git a/include/c99/stdint.h b/include/c99/stdint.h
new file mode 100644 (file)
index 0000000..e380213
--- /dev/null
+++ b/include/c99/stdint.h
@@ -0,0 +1,119 @@
+/**************************************************************************
+ *
+ * Copyright 2007-2010 VMware, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ **************************************************************************/
+
+/*
+ * stdint.h --
+ *
+ *    Portable subset of C99's stdint.h.
+ *
+ *    At the moment it only supports MSVC, given all other mainstream compilers
+ *    already support C99. If this is necessary for other compilers then it
+ *    might be worth to replace this with
+ *    http://www.azillionmonkeys.com/qed/pstdint.h.
+ */
+
+#ifndef _STDINT_H_
+#define _STDINT_H_
+
+
+#ifndef INT8_MAX
+#define INT8_MAX           127
+#endif
+#ifndef INT8_MIN
+#define INT8_MIN           -128
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX          255
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX          32767
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN          -32768
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX         65535
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX          2147483647
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN          -2147483648
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX         4294967295U
+#endif
+
+#ifndef INT8_C
+#define INT8_C(__val)     __val
+#endif
+#ifndef UINT8_C
+#define UINT8_C(__val)    __val
+#endif
+#ifndef INT16_C
+#define INT16_C(__val)    __val
+#endif
+#ifndef UINT16_C
+#define UINT16_C(__val)   __val
+#endif
+#ifndef INT32_C
+#define INT32_C(__val)    __val
+#endif
+#ifndef UINT32_C
+#define UINT32_C(__val)   __val##U
+#endif
+
+
+#if defined(_MSC_VER)
+
+typedef __int8             int8_t;
+typedef unsigned __int8    uint8_t;
+typedef __int16            int16_t;
+typedef unsigned __int16   uint16_t;
+#ifndef __eglplatform_h_
+typedef __int32            int32_t;
+#endif
+typedef unsigned __int32   uint32_t;
+typedef __int64            int64_t;
+typedef unsigned __int64   uint64_t;
+
+#if defined(_WIN64)
+typedef __int64            intptr_t;
+typedef unsigned __int64   uintptr_t;
+#else
+typedef __int32            intptr_t;
+typedef unsigned __int32   uintptr_t;
+#endif
+
+#define INT64_C(__val)    __val##i64
+#define UINT64_C(__val)   __val##ui64
+
+#else
+#error "Unsupported compiler"
+#endif
+
+#endif /* _STDINT_H_ */

diff --git a/scons/llvm.py b/scons/llvm.py
index 7b266502907fd47be168038d1d8a8f717a7ebe0d..5b9c82f11033555789421621bca12461a5d60920 100644 (file)
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -65,6 +65,7 @@ def generate(env):
             env.AppendUnique(CPPDEFINES = [
                 '__STDC_LIMIT_MACROS', 
                 '__STDC_CONSTANT_MACROS',
+                'HAVE_STDINT_H',
             ])
             env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])
             env.Prepend(LIBS = [

diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index f7368bb95b354819322765af1c146aa7deb2766a..7d7332b3263e73c047ce5a876baafc0650042ea3 100644 (file)
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -52,45 +52,15 @@
 #endif /* _MSC_VER */
 
 
-#if defined(_MSC_VER)
-
-typedef __int8             int8_t;
-typedef unsigned __int8    uint8_t;
-typedef __int16            int16_t;
-typedef unsigned __int16   uint16_t;
-#ifndef __eglplatform_h_
-typedef __int32            int32_t;
-#endif
-typedef unsigned __int32   uint32_t;
-typedef __int64            int64_t;
-typedef unsigned __int64   uint64_t;
-
-#if defined(_WIN64)
-typedef __int64            intptr_t;
-typedef unsigned __int64   uintptr_t;
-#else
-typedef __int32            intptr_t;
-typedef unsigned __int32   uintptr_t;
-#endif
-
-#define INT64_C(__val) __val##i64
-#define UINT64_C(__val) __val##ui64
-
-#ifndef __cplusplus
-#define false   0
-#define true    1
-#define bool    _Bool
-typedef int     _Bool;
-#define __bool_true_false_are_defined   1
-#endif /* !__cplusplus */
-
-#else
+/*
+ * Alternative stdint.h and stdbool.h headers are supplied in include/c99 for
+ * systems that lack it.
+ */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
 #endif
 #include <stdint.h>
 #include <stdbool.h>
-#endif
 
 
 #ifndef __HAIKU__