From 7172c8a4217da771e3432bb49b17805b249f89fd Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Tue, 9 Aug 2022 07:43:22 -0400
Subject: [PATCH] zink: remove c++ guard from zink_resource.h

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18135>
---
 src/gallium/drivers/zink/zink_resource.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_resource.h b/src/gallium/drivers/zink/zink_resource.h
index 5fc4e3e..f368a5d 100644
--- a/src/gallium/drivers/zink/zink_resource.h
+++ b/src/gallium/drivers/zink/zink_resource.h
@@ -84,9 +84,6 @@ zink_is_swapchain(const struct zink_resource *res)
    return res->swapchain;
 }
 
-#ifdef __cplusplus
-}
-#else
 #include "zink_batch.h"
 #include "zink_bo.h"
 
@@ -145,6 +142,8 @@ zink_resource_object_usage_unset(struct zink_resource_object *obj, struct zink_b
    return zink_bo_usage_unset(obj->bo, bs);
 }
 
+#ifdef __cplusplus
+}
 #endif
 
 #endif
-- 
2.7.4