From b432bdc035926525523652932c8182476d844dd9 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 1 Jul 2021 21:13:06 -0400
Subject: [PATCH] zink: add c++ header guards

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11685>
---
 src/gallium/drivers/zink/zink_batch.h       | 8 ++++++++
 src/gallium/drivers/zink/zink_context.h     | 9 +++++++++
 src/gallium/drivers/zink/zink_descriptors.h | 7 +++++++
 src/gallium/drivers/zink/zink_program.h     | 6 ++++++
 src/gallium/drivers/zink/zink_query.h       | 7 +++++++
 5 files changed, 37 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_batch.h b/src/gallium/drivers/zink/zink_batch.h
index 90ab7d3746c..fc1bc7da84b 100644
--- a/src/gallium/drivers/zink/zink_batch.h
+++ b/src/gallium/drivers/zink/zink_batch.h
@@ -32,6 +32,10 @@
 
 #include "zink_fence.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct pipe_reference;
 
 struct zink_buffer_view;
@@ -216,4 +220,8 @@ zink_batch_usage_check_completion(struct zink_context *ctx, const struct zink_ba
 void
 zink_batch_usage_wait(struct zink_context *ctx, struct zink_batch_usage *u);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index e0aecbe7865..825593e26d7 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -46,6 +46,10 @@
 
 #include <vulkan/vulkan.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct blitter_context;
 struct list_head;
 
@@ -439,4 +443,9 @@ zink_pipeline_flags_from_pipe_stage(enum pipe_shader_type pstage)
       unreachable("unknown shader stage");
    }
 }
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/gallium/drivers/zink/zink_descriptors.h b/src/gallium/drivers/zink/zink_descriptors.h
index 79a08a84bc1..09e72546343 100644
--- a/src/gallium/drivers/zink/zink_descriptors.h
+++ b/src/gallium/drivers/zink/zink_descriptors.h
@@ -32,6 +32,9 @@
 #include "util/simple_mtx.h"
 
 #include "zink_batch.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #ifndef ZINK_SHADER_COUNT
 #define ZINK_SHADER_COUNT (PIPE_SHADER_TYPES - 1)
@@ -280,4 +283,8 @@ zink_descriptors_deinit_lazy(struct zink_context *ctx);
 
 void
 zink_descriptor_set_update_lazy(struct zink_context *ctx, struct zink_program *pg, enum zink_descriptor_type type, VkDescriptorSet set);
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/gallium/drivers/zink/zink_program.h b/src/gallium/drivers/zink/zink_program.h
index 1f9d688e7f9..d8221c878da 100644
--- a/src/gallium/drivers/zink/zink_program.h
+++ b/src/gallium/drivers/zink/zink_program.h
@@ -33,6 +33,9 @@
 #include "zink_context.h"
 #include "zink_compiler.h"
 #include "zink_shader_keys.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 struct zink_screen;
 struct zink_shader;
@@ -229,5 +232,8 @@ zink_program_has_descriptors(const struct zink_program *pg)
 {
    return pg->num_dsl > 0;
 }
+#ifdef __cplusplus
+}
+#endif
 
 #endif
diff --git a/src/gallium/drivers/zink/zink_query.h b/src/gallium/drivers/zink/zink_query.h
index 64c81c2529e..1f90ecc226e 100644
--- a/src/gallium/drivers/zink/zink_query.h
+++ b/src/gallium/drivers/zink/zink_query.h
@@ -29,6 +29,9 @@ struct zink_context;
 struct zink_fence;
 struct zink_query;
 struct zink_screen;
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 void
 zink_suspend_queries(struct zink_context *ctx, struct zink_batch *batch);
@@ -47,4 +50,8 @@ zink_start_conditional_render(struct zink_context *ctx);
 
 void
 zink_stop_conditional_render(struct zink_context *ctx);
+#ifdef __cplusplus
+}
+#endif
+
 #endif