Mesa (master): util: Fix build for C++ compilers.

Michał Król michal at kemper.freedesktop.org
Fri Aug 20 09:51:57 PDT 2010


Module: Mesa
Branch: master
Commit: a43a2f0662c4aa33b50882411181252198819942
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a43a2f0662c4aa33b50882411181252198819942

Author: Michal Krol <michal at vmware.com>
Date:   Fri Aug 20 18:51:22 2010 +0200

util: Fix build for C++ compilers.

---

 src/gallium/auxiliary/util/u_debug_describe.h |    8 ++++++++
 src/gallium/auxiliary/util/u_debug_refcnt.h   |    8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_debug_describe.h b/src/gallium/auxiliary/util/u_debug_describe.h
index cab614b..8c32f02 100644
--- a/src/gallium/auxiliary/util/u_debug_describe.h
+++ b/src/gallium/auxiliary/util/u_debug_describe.h
@@ -1,10 +1,18 @@
 #ifndef U_DEBUG_DESCRIBE_H_
 #define U_DEBUG_DESCRIBE_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* a 256-byte buffer is necessary and sufficient */
 void debug_describe_reference(char* buf, const struct pipe_reference*ptr);
 void debug_describe_resource(char* buf, const struct pipe_resource *ptr);
 void debug_describe_surface(char* buf, const struct pipe_surface *ptr);
 void debug_describe_sampler_view(char* buf, const struct pipe_sampler_view *ptr);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* U_DEBUG_DESCRIBE_H_ */
diff --git a/src/gallium/auxiliary/util/u_debug_refcnt.h b/src/gallium/auxiliary/util/u_debug_refcnt.h
index e48a2a6..ba40999 100644
--- a/src/gallium/auxiliary/util/u_debug_refcnt.h
+++ b/src/gallium/auxiliary/util/u_debug_refcnt.h
@@ -11,6 +11,10 @@
 #include <pipe/p_config.h>
 #include <pipe/p_state.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(DEBUG) && (!defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_WINDOWS_USER))
 extern int debug_refcnt_state;
 
@@ -26,4 +30,8 @@ static INLINE void debug_reference(const struct pipe_reference* p, void* get_des
 {}
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* U_DEBUG_REFCNT_H_ */



More information about the mesa-commit mailing list