zink: remove c++ guard from zink_resource.h
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Tue, 9 Aug 2022 11:43:22 +0000 (07:43 -0400)
committerMarge Bot <emma+marge@anholt.net>
Sat, 20 Aug 2022 01:27:13 +0000 (01:27 +0000)
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

index 5fc4e3e..f368a5d 100644 (file)
@@ -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