From c2c00570b3f95fbc5f38a68aef2070a5d9d9f09c Mon Sep 17 00:00:00 2001 From: Mickey Rose Date: Sun, 8 Jul 2018 20:25:40 +0200 Subject: [PATCH] define MAPNIK_MAKE_VERSION, MAPNIK_VERSION_AT_LEAST --- include/mapnik/version.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp index bfeb18e2a..63a297b7e 100644 --- a/include/mapnik/version.hpp +++ b/include/mapnik/version.hpp @@ -29,10 +29,18 @@ #define MAPNIK_MINOR_VERSION 1 #define MAPNIK_PATCH_VERSION 0 -#define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION) +#define MAPNIK_VERSION MAPNIK_MAKE_VERSION(MAPNIK_MAJOR_VERSION, \ + MAPNIK_MINOR_VERSION, \ + MAPNIK_PATCH_VERSION) #define MAPNIK_VERSION_STRING MAPNIK_STRINGIFY(MAPNIK_MAJOR_VERSION) "." \ MAPNIK_STRINGIFY(MAPNIK_MINOR_VERSION) "." \ MAPNIK_STRINGIFY(MAPNIK_PATCH_VERSION) +#define MAPNIK_VERSION_AT_LEAST(major, minor, patch) \ + (MAPNIK_VERSION >= MAPNIK_MAKE_VERSION(major, minor, patch)) + +#define MAPNIK_MAKE_VERSION(major, minor, patch) \ + ((major) * 100000 + (minor) * 100 + (patch)) + #endif // MAPNIK_VERSION_HPP