Mesa (master): vulkan/util: make header available from c++

[GitLab Mirror]

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

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Mon Feb 25 23:01:02 2019 +0000

vulkan/util: make header available from c++

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

---

 src/vulkan/util/vk_util.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/vulkan/util/vk_util.h b/src/vulkan/util/vk_util.h
index e7404b08808..89b90a60d20 100644
--- a/src/vulkan/util/vk_util.h
+++ b/src/vulkan/util/vk_util.h
@@ -23,6 +23,10 @@
 #ifndef VK_UTIL_H
 #define VK_UTIL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* common inlines and macros for vulkan drivers */
 
 #include <vulkan/vulkan.h>
@@ -122,7 +126,7 @@ __vk_outarray_next(struct __vk_outarray *a, size_t elem_size)
       return NULL;
 
    if (a->data != NULL)
-      p = a->data + (*a->filled_len) * elem_size;
+      p = (uint8_t *)a->data + (*a->filled_len) * elem_size;
 
    *a->filled_len += 1;
 
@@ -202,4 +206,8 @@ uint32_t vk_get_version_override(void);
 #define VK_ENUM_OFFSET(__enum) \
    ((__enum) >= VK_EXT_OFFSET ? ((__enum) % 1000) : (__enum))
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* VK_UTIL_H */