From bd12e025305947066006a6518f5743969aa5664d Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 23 Nov 2018 15:13:02 +0000 Subject: [PATCH] vulkan/utils: s/VERSION/PACKAGE_VERSION/ Everything else uses PACKAGE_VERSION, so let's be consistent, and VERSION and PACKAGE_VERSION are currently defined to be the same in meson and android, while VERSION is undefined in autotools and scons. Signed-off-by: Eric Engestrom Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Emil Velikov Reviewed-by: Dylan Baker --- src/vulkan/util/vk_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vulkan/util/vk_util.c b/src/vulkan/util/vk_util.c index ec95a89078a..cf06b1f44c4 100644 --- a/src/vulkan/util/vk_util.c +++ b/src/vulkan/util/vk_util.c @@ -29,12 +29,12 @@ uint32_t vk_get_driver_version(void) { - const char *minor_string = strchr(VERSION, '.'); + const char *minor_string = strchr(PACKAGE_VERSION, '.'); const char *patch_string = minor_string ? strchr(minor_string + 1, '.') : NULL; - int major = atoi(VERSION); + int major = atoi(PACKAGE_VERSION); int minor = minor_string ? atoi(minor_string + 1) : 0; int patch = patch_string ? atoi(patch_string + 1) : 0; - if (strstr(VERSION, "devel")) { + if (strstr(PACKAGE_VERSION, "devel")) { if (patch == 0) { patch = 99; if (minor == 0) { -- 2.30.2