util: Merge p_compiler.h into src/util/compiler.h

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23577>

diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index 3a0d8fe..41a1d26 100644 (file)
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -30,41 +30,5 @@
 
 
 #include "util/compiler.h"
-#include "util/detect.h"
-#include "util/macros.h"
-
-#include <limits.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#if !defined(__HAIKU__) && !defined(__USE_MISC)
-#if !DETECT_OS_ANDROID
-typedef unsigned int       uint;
-#endif
-typedef unsigned short     ushort;
-#endif
-typedef unsigned char      ubyte;
-
-typedef unsigned char boolean;
-#ifndef TRUE
-#define TRUE  true
-#endif
-#ifndef FALSE
-#define FALSE false
-#endif
-
-#if defined(__cplusplus)
-}
-#endif
-
 
 #endif /* P_COMPILER_H */

diff --git a/src/util/compiler.h b/src/util/compiler.h
index ebb0ac8..ddd4cfb 100644 (file)
--- a/src/util/compiler.h
+++ b/src/util/compiler.h
@@ -35,10 +35,16 @@
 
 
 #include <assert.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "util/detect.h"
 #include "util/macros.h"
-#include "util/u_endian.h"
-#include "util/detect_arch.h"
 
 /**
  * Define CPU_TO_LE32
@@ -101,4 +107,18 @@
 #define FALLTHROUGH do { } while(0)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(__HAIKU__) && !defined(__USE_MISC)
+#if !DETECT_OS_ANDROID
+typedef unsigned int       uint;
+#endif
+#endif
+
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* COMPILER_H */