Mesa (master): gallium/util: allow including a few files in C++

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Aug 25 22:49:31 2020 -0400

gallium/util: allow including a few files in C++

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7807>

---

 src/gallium/auxiliary/util/u_index_modify.h | 8 ++++++++
 src/gallium/auxiliary/util/u_log.h          | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/gallium/auxiliary/util/u_index_modify.h b/src/gallium/auxiliary/util/u_index_modify.h
index ba96725bedd..7540dbaae63 100644
--- a/src/gallium/auxiliary/util/u_index_modify.h
+++ b/src/gallium/auxiliary/util/u_index_modify.h
@@ -23,6 +23,10 @@
 #ifndef UTIL_INDEX_MODIFY_H
 #define UTIL_INDEX_MODIFY_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct pipe_context;
 struct pipe_resource;
 
@@ -48,4 +52,8 @@ void util_rebuild_uint_elts_to_userptr(struct pipe_context *context,
 				       unsigned start, unsigned count,
 				       void *out);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/gallium/auxiliary/util/u_log.h b/src/gallium/auxiliary/util/u_log.h
index 90f5d0f4de1..e16af5c1820 100644
--- a/src/gallium/auxiliary/util/u_log.h
+++ b/src/gallium/auxiliary/util/u_log.h
@@ -49,6 +49,10 @@
 
 #include "util/u_debug.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct u_log_page;
 struct u_log_auto_logger;
 
@@ -97,4 +101,8 @@ u_log_page_destroy(struct u_log_page *page);
 void
 u_log_page_print(struct u_log_page *page, FILE *stream);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* U_LOG_H */