---
src/mesa/main/compiler.h | 21 ---------------------
src/util/macros.h | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index f56dc3e..b0d8c8f 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -113,27 +113,6 @@ extern "C" {
#define LE32_TO_CPU( x ) CPU_TO_LE32( x )
-
-/**
- * Use __cdecl to match gcc calling convention for caller stack cleanup
- * so we can use the same assembly / codegen code on all platforms.
- */
-#if !defined(_MSC_VER)
-#define __cdecl
-#endif
-
-
-
-/**
- * LONGSTRING macro
- * gcc -pedantic warns about long string literals, LONGSTRING silences that.
- */
-#if !defined(__GNUC__)
-# define LONGSTRING
-#else
-# define LONGSTRING __extension__
-#endif
-
#define IEEE_ONE 0x3f800000
diff --git a/src/util/macros.h b/src/util/macros.h
index 6c7bda7..709c8da 100644
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -183,4 +183,24 @@ do { \
#endif
+/**
+ * Use __cdecl to match gcc calling convention for caller stack cleanup
+ * so we can use the same assembly / codegen code on all platforms.
+ */
+#if !defined(_MSC_VER)
+# define __cdecl
+#endif
+
+
+/**
+ * LONGSTRING macro
+ * gcc -pedantic warns about long string literals, LONGSTRING silences that.
+ */
+#if !defined(__GNUC__)
+# define LONGSTRING
+#else
+# define LONGSTRING __extension__
+#endif
+
+
#endif /* UTIL_MACROS_H */
--
1.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
