Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

[mesa.git] / src / gallium / include / pipe / p_compiler.h

diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index d2b8c41be3d2af28c837eac195361b59410d3d42..2afb8464c736b3e56058a51b155e65e2f997ba17 100644 (file)
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -107,7 +107,9 @@ typedef unsigned char boolean;
 
 
 /* Function inlining */
-#if defined(__GNUC__)
+#ifdef __cplusplus
+#  define INLINE inline
+#elif defined(__GNUC__)
 #  define INLINE __inline__
 #elif defined(_MSC_VER)
 #  define INLINE __inline