Mesa (master): gallium: Move some compiler portability stuff into p_compiler.h
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Feb 3 19:37:05 UTC 2010
Module: Mesa
Branch: master
Commit: aa8b49c9ca6b446e335bda4945e48107e5e4128a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa8b49c9ca6b446e335bda4945e48107e5e4128a
Author: José Fonseca <jfonseca at vmware.com>
Date: Tue Feb 2 20:55:08 2010 +0000
gallium: Move some compiler portability stuff into p_compiler.h
---
src/gallium/auxiliary/util/u_debug.h | 7 -------
src/gallium/include/pipe/p_compiler.h | 4 ++++
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index facc30a..c9cd56f 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -39,8 +39,6 @@
#define U_DEBUG_H_
-#include <stdarg.h>
-
#include "pipe/p_compiler.h"
@@ -60,11 +58,6 @@ extern "C" {
#endif
-/* MSVC bebore VC7 does not have the __FUNCTION__ macro */
-#if defined(_MSC_VER) && _MSC_VER < 1300
-#define __FUNCTION__ "???"
-#endif
-
#if defined(__GNUC__)
#define _util_printf_format(fmt, list) __attribute__ ((format (printf, fmt, list)))
#else
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index b02d3ff..84956a2 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -39,6 +39,7 @@
#include "xf86_libc.h"
#endif
#include <stddef.h>
+#include <stdarg.h>
#if defined(_WIN32) && !defined(__WIN32__)
@@ -126,6 +127,9 @@ typedef unsigned char boolean;
# define __FUNCTION__ "<unknown>"
# endif
# endif
+# if defined(_MSC_VER) && _MSC_VER < 1300
+# define __FUNCTION__ "<unknown>"
+# endif
#endif
More information about the mesa-commit
mailing list