diff --git a/CMakeLists.txt b/CMakeLists.txt index e156d6e3f..9477a2c96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake) find_package(re CONFIG REQUIRED) list(APPEND RE_DEFINITIONS - -DVERSION="${PROJECT_VERSION_FULL}" + -DRE_VERSION="${PROJECT_VERSION_FULL}" -DVER_MAJOR=${PROJECT_VERSION_MAJOR} -DVER_MINOR=${PROJECT_VERSION_MINOR} -DVER_PATCH=${PROJECT_VERSION_PATCH} diff --git a/include/re_sys.h b/include/re_sys.h index 8dd5df4ef..36ca13988 100644 --- a/include/re_sys.h +++ b/include/re_sys.h @@ -5,8 +5,8 @@ */ #include -#ifndef VERSION -#define VERSION "?" +#ifndef RE_VERSION +#define RE_VERSION "?" #endif /** diff --git a/src/http/request.c b/src/http/request.c index 9c73f5c22..35c2b72c5 100644 --- a/src/http/request.c +++ b/src/http/request.c @@ -31,8 +31,8 @@ #define DEBUG_LEVEL 5 #include -#ifndef VERSION -#define VERSION "???" +#ifndef RE_VERSION +#define RE_VERSION "???" #endif @@ -358,7 +358,7 @@ static int send_req(struct http_reqconn *conn, const struct pl *auth) (conn->bodyh || conn->body) ? req_body_handler : NULL, conn, "%r%s" - "User-Agent: re " VERSION "\r\n" + "User-Agent: re " RE_VERSION "\r\n" "%r" "%r" "%r" diff --git a/src/ice/stunsrv.c b/src/ice/stunsrv.c index a9ba7eb6e..83cd1681f 100644 --- a/src/ice/stunsrv.c +++ b/src/ice/stunsrv.c @@ -22,7 +22,7 @@ #include -static const char *sw = "ice stunsrv v" VERSION " (" ARCH "/" OS ")"; +static const char *sw = "ice stunsrv v" RE_VERSION " (" ARCH "/" OS ")"; static void triggered_check(struct icem *icem, struct ice_cand *lcand, diff --git a/src/stun/stun.c b/src/stun/stun.c index 6dfdd977a..704c2b1f1 100644 --- a/src/stun/stun.c +++ b/src/stun/stun.c @@ -18,7 +18,7 @@ #include "stun.h" -const char *stun_software = "libre v" VERSION " (" ARCH "/" OS ")"; +const char *stun_software = "libre v" RE_VERSION " (" ARCH "/" OS ")"; static const struct stun_conf conf_default = { diff --git a/src/sys/sys.c b/src/sys/sys.c index 020c79eb5..5cee75e6a 100644 --- a/src/sys/sys.c +++ b/src/sys/sys.c @@ -139,8 +139,8 @@ const char *sys_os_get(void) */ const char *sys_libre_version_get(void) { -#ifdef VERSION - return VERSION; +#ifdef RE_VERSION + return RE_VERSION; #else return "?"; #endif diff --git a/src/trice/stunsrv.c b/src/trice/stunsrv.c index f69e86c3a..700bdbef6 100644 --- a/src/trice/stunsrv.c +++ b/src/trice/stunsrv.c @@ -25,7 +25,7 @@ #include -static const char *sw = "ice stunsrv v" VERSION " (" ARCH "/" OS ")"; +static const char *sw = "ice stunsrv v" RE_VERSION " (" ARCH "/" OS ")"; /*