Mesa (master): util/u_rect: Make it C++ safe.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri Nov 9 13:56:28 UTC 2012


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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Nov  5 15:45:48 2012 +0000

util/u_rect: Make it C++ safe.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/gallium/auxiliary/util/u_rect.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_rect.h b/src/gallium/auxiliary/util/u_rect.h
index 4cb90d3..8fccae8 100644
--- a/src/gallium/auxiliary/util/u_rect.h
+++ b/src/gallium/auxiliary/util/u_rect.h
@@ -31,6 +31,10 @@
 
 #include "pipe/p_compiler.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct u_rect {
    int x0, x1;
    int y0, y1;
@@ -75,6 +79,10 @@ u_rect_possible_intersection(const struct u_rect *a,
    }
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #include "pipe/p_format.h"
 #include "util/u_pack_color.h"
 
@@ -88,6 +96,10 @@ u_rect_possible_intersection(const struct u_rect *a,
  */
 #include "pipe/p_format.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern void
 util_copy_rect(ubyte * dst, enum pipe_format format,
                unsigned dst_stride, unsigned dst_x, unsigned dst_y,
@@ -99,5 +111,8 @@ util_fill_rect(ubyte * dst, enum pipe_format format,
                unsigned dst_stride, unsigned dst_x, unsigned dst_y,
                unsigned width, unsigned height, union util_color *uc);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* U_RECT_H */




More information about the mesa-commit mailing list