diff options
| author | Edward O'Callaghan <[email protected]> | 2016-12-07 10:30:48 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <[email protected]> | 2016-12-07 22:32:38 +1100 |
| commit | a77426fd922259bc37b762fa22b42b91d3ce494a (patch) | |
| tree | 43837e716eec22e379cd618eb6ff210e4d854c0e | |
| parent | e9f17e9fb06a4389588f47be8c766b07e8d8b89f (diff) | |
vulkan: use STATIC_ASSERT instead of static_assert
Following the spirit of commit 23d1799f, fixes compilation
warnings on Android build due to lack of C11 features.
Signed-off-by: Edward O'Callaghan <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_private.h | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_wayland.c | 2 | ||||
| -rw-r--r-- | src/vulkan/wsi/wsi_common_x11.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index def0af2069d..4b720175c7b 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -173,7 +173,7 @@ radv_clear_mask(uint32_t *inout_mask, uint32_t clear_mask) __dword &= ~(1 << (b))) #define typed_memcpy(dest, src, count) ({ \ - static_assert(sizeof(*src) == sizeof(*dest), ""); \ + STATIC_ASSERT(sizeof(*src) == sizeof(*dest)); \ memcpy((dest), (src), (count) * sizeof(*(src))); \ }) diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index f6c218bde3f..2fe889ecc2a 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -38,7 +38,7 @@ #include <util/u_vector.h> #define typed_memcpy(dest, src, count) ({ \ - static_assert(sizeof(*src) == sizeof(*dest), ""); \ + STATIC_ASSERT(sizeof(*src) == sizeof(*dest)); \ memcpy((dest), (src), (count) * sizeof(*(src))); \ }) diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index 56398ce1d93..25ba0c1b8ae 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -42,7 +42,7 @@ #include "wsi_common_queue.h" #define typed_memcpy(dest, src, count) ({ \ - static_assert(sizeof(*src) == sizeof(*dest), ""); \ + STATIC_ASSERT(sizeof(*src) == sizeof(*dest)); \ memcpy((dest), (src), (count) * sizeof(*(src))); \ }) |