From 35c0ef885277d5c80f760796c0ad51e139931bb0 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Mon, 24 Jun 2019 11:54:30 +0200
Subject: [PATCH] zink: squashme: trade cplusplus wrapper for header-guard

Acked-by: Jordan Justen <jordan.l.justen@intel.com>
---
 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h
index 55a0e01e079..758ca901a2d 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.h
@@ -21,9 +21,8 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef NIR_TO_SPIRV_H
+#define NIR_TO_SPIRV_H
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -42,6 +41,4 @@ nir_to_spirv(struct nir_shader *s);
 void
 spirv_shader_delete(struct spirv_shader *s);
 
-#ifdef __cplusplus
-}
 #endif
-- 
2.30.2