[Mesa-dev] [PATCH mesa 1/2] vulkan/utils: s/VERSION/PACKAGE_VERSION/

Eric Engestrom eric.engestrom at intel.com
Sun Nov 25 17:11:56 UTC 2018


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 <eric.engestrom at intel.com>
---
 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 ec95a89078ad702f3754..cf06b1f44c4b1fc79a8b 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) {
-- 
Cheers,
  Eric



More information about the mesa-dev mailing list