diff options
| -rw-r--r-- | src/gallium/auxiliary/util/u_debug.h | 7 | ||||
| -rw-r--r-- | 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 facc30a553..c9cd56f305 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 b02d3ffe43..84956a2ba4 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 |