From 6f2c6625e49e722a0f2121d8f98de86f3ba7d40d Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 18 May 2021 12:31:59 +0200 Subject: [PATCH] Added FREERDP/WINPR prefix to define GIT_REVISION --- client/common/cmdline.c | 2 +- client/iOS/Misc/Utils.m | 2 +- include/freerdp/version.h.in | 2 +- libfreerdp/core/freerdp.c | 2 +- libfreerdp/core/test/TestVersion.c | 2 +- server/proxy/freerdp_proxy.c | 2 +- server/shadow/shadow_server.c | 2 +- winpr/include/winpr/version.h.in | 2 +- winpr/libwinpr/utils/test/TestVersion.c | 2 +- winpr/libwinpr/utils/winpr.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/common/cmdline.c b/client/common/cmdline.c index 9114446cd..52e502a61 100644 --- a/client/common/cmdline.c +++ b/client/common/cmdline.c @@ -270,7 +270,7 @@ static BOOL value_to_uint(const char* value, ULONGLONG* result, ULONGLONG min, U BOOL freerdp_client_print_version(void) { - printf("This is FreeRDP version %s (%s)\n", FREERDP_VERSION_FULL, GIT_REVISION); + printf("This is FreeRDP version %s (%s)\n", FREERDP_VERSION_FULL, FREERDP_GIT_REVISION); return TRUE; } diff --git a/client/iOS/Misc/Utils.m b/client/iOS/Misc/Utils.m index 9b70b5cfc..cf235b6a0 100644 --- a/client/iOS/Misc/Utils.m +++ b/client/iOS/Misc/Utils.m @@ -247,7 +247,7 @@ NSMutableArray *FilterHistory(NSArray *history, NSString *filterStr) #pragma mark Version Info NSString *TSXAppFullVersion() { - return [NSString stringWithUTF8String:GIT_REVISION]; + return [NSString stringWithUTF8String:FREERDP_GIT_REVISION]; } #pragma mark iPad/iPhone detection diff --git a/include/freerdp/version.h.in b/include/freerdp/version.h.in index 3930dc366..4dffb5f53 100644 --- a/include/freerdp/version.h.in +++ b/include/freerdp/version.h.in @@ -27,6 +27,6 @@ #define FREERDP_API_VERSION "${FREERDP_API_VERSION}" #define FREERDP_VERSION "${FREERDP_VERSION}" #define FREERDP_VERSION_FULL "${FREERDP_VERSION_FULL}" -#define GIT_REVISION "${GIT_REVISION}" +#define FREERDP_GIT_REVISION "${GIT_REVISION}" #endif /* FREERDP_VERSION_H */ diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c index 371defa9d..0ec42a316 100644 --- a/libfreerdp/core/freerdp.c +++ b/libfreerdp/core/freerdp.c @@ -524,7 +524,7 @@ const char* freerdp_get_build_config(void) const char* freerdp_get_build_revision(void) { - return GIT_REVISION; + return FREERDP_GIT_REVISION; } static wEventType FreeRDP_Events[] = { diff --git a/libfreerdp/core/test/TestVersion.c b/libfreerdp/core/test/TestVersion.c index 3bda19dd0..a555ae683 100644 --- a/libfreerdp/core/test/TestVersion.c +++ b/libfreerdp/core/test/TestVersion.c @@ -30,7 +30,7 @@ int TestVersion(int argc, char* argv[]) if (!git) return -1; - if (strncmp(git, GIT_REVISION, sizeof(GIT_REVISION))) + if (strncmp(git, FREERDP_GIT_REVISION, sizeof(FREERDP_GIT_REVISION))) return -1; build = freerdp_get_build_config(); diff --git a/server/proxy/freerdp_proxy.c b/server/proxy/freerdp_proxy.c index d6888f424..7d72639d3 100644 --- a/server/proxy/freerdp_proxy.c +++ b/server/proxy/freerdp_proxy.c @@ -88,7 +88,7 @@ int main(int argc, char* argv[]) WLog_INFO(TAG, "freerdp-proxy version info:"); WLog_INFO(TAG, "\tFreeRDP version: %s", FREERDP_VERSION_FULL); - WLog_INFO(TAG, "\tGit commit: %s", GIT_REVISION); + WLog_INFO(TAG, "\tGit commit: %s", FREERDP_GIT_REVISION); WLog_DBG(TAG, "\tBuild config: %s", freerdp_get_build_config()); if (argc >= 2) diff --git a/server/shadow/shadow_server.c b/server/shadow/shadow_server.c index e8ee9505d..b787fa626 100644 --- a/server/shadow/shadow_server.c +++ b/server/shadow/shadow_server.c @@ -124,7 +124,7 @@ int shadow_server_command_line_status_print(rdpShadowServer* server, int argc, c if (status == COMMAND_LINE_STATUS_PRINT_VERSION) { - WLog_INFO(TAG, "FreeRDP version %s (git %s)", FREERDP_VERSION_FULL, GIT_REVISION); + WLog_INFO(TAG, "FreeRDP version %s (git %s)", FREERDP_VERSION_FULL, FREERDP_GIT_REVISION); return COMMAND_LINE_STATUS_PRINT_VERSION; } else if (status == COMMAND_LINE_STATUS_PRINT_BUILDCONFIG) diff --git a/winpr/include/winpr/version.h.in b/winpr/include/winpr/version.h.in index 45d74747e..ef209bbfb 100644 --- a/winpr/include/winpr/version.h.in +++ b/winpr/include/winpr/version.h.in @@ -27,6 +27,6 @@ #define WINPR_API_VERSION "${WINPR_API_VERSION}" #define WINPR_VERSION "${WINPR_VERSION}" #define WINPR_VERSION_FULL "${WINPR_VERSION_FULL}" -#define GIT_REVISION "${GIT_REVISION}" +#define WINPR_GIT_REVISION "${GIT_REVISION}" #endif // _WINPR_VERSION_H_ diff --git a/winpr/libwinpr/utils/test/TestVersion.c b/winpr/libwinpr/utils/test/TestVersion.c index 0f7c9ae19..77225bda2 100644 --- a/winpr/libwinpr/utils/test/TestVersion.c +++ b/winpr/libwinpr/utils/test/TestVersion.c @@ -33,7 +33,7 @@ int TestVersion(int argc, char* argv[]) if (!git) return -1; - if (strncmp(git, GIT_REVISION, sizeof(GIT_REVISION))) + if (strncmp(git, WINPR_GIT_REVISION, sizeof(WINPR_GIT_REVISION))) return -1; build = winpr_get_build_config(); diff --git a/winpr/libwinpr/utils/winpr.c b/winpr/libwinpr/utils/winpr.c index aa031b139..c108b59b9 100644 --- a/winpr/libwinpr/utils/winpr.c +++ b/winpr/libwinpr/utils/winpr.c @@ -53,7 +53,7 @@ const char* winpr_get_version_string(void) const char* winpr_get_build_revision(void) { - return GIT_REVISION; + return WINPR_GIT_REVISION; } const char* winpr_get_build_config(void)