Skip to content

Commit 2c608df

Browse files
authored
Merge pull request #621 from ldorau/Fix_warning_RC4005_UMF_VERSION__redefinition
Fix warnings RC4005: 'UMF_VERSION' : redefinition
2 parents 246f051 + e5fcc5b commit 2c608df

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/libumf.rc.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "umf/base.h"
1010

1111
#define UMF_VERNUMBERS @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
12-
#define UMF_VERSION "@UMF_VERSION@"
12+
#define _UMF_VERSION "@UMF_VERSION@"
1313

1414
#ifdef _DEBUG
1515
#define VERSION_DEBUG VS_FF_DEBUG
@@ -50,12 +50,12 @@ BEGIN
5050
BEGIN
5151
VALUE "CompanyName", "Intel Corporation\0"
5252
VALUE "FileDescription", "Unified Memory Framework (UMF) library\0"
53-
VALUE "FileVersion", UMF_VERSION "\0"
53+
VALUE "FileVersion", _UMF_VERSION "\0"
5454
VALUE "LegalCopyright", "Copyright 2024, Intel Corporation. All rights reserved.\0"
5555
VALUE "LegalTrademarks", "\0"
5656
VALUE "OriginalFilename", "umf.dll\0"
5757
VALUE "ProductName", "Unified Memory Framework (UMF)\0"
58-
VALUE "ProductVersion", UMF_VERSION "\0"
58+
VALUE "ProductVersion", _UMF_VERSION "\0"
5959
VALUE "PrivateBuild", "\0"
6060
VALUE "SpecialBuild", "\0"
6161
END

src/proxy_lib/proxy_lib.rc.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "umf/base.h"
1010

1111
#define UMF_VERNUMBERS @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@UMF_VERSION_REVISION@
12-
#define UMF_VERSION "@UMF_VERSION@"
12+
#define _UMF_VERSION "@UMF_VERSION@"
1313

1414
#ifdef _DEBUG
1515
#define VERSION_DEBUG VS_FF_DEBUG
@@ -50,12 +50,12 @@ BEGIN
5050
BEGIN
5151
VALUE "CompanyName", "Intel Corporation\0"
5252
VALUE "FileDescription", "Unified Memory Framework (UMF) proxy library\0"
53-
VALUE "FileVersion", UMF_VERSION "\0"
53+
VALUE "FileVersion", _UMF_VERSION "\0"
5454
VALUE "LegalCopyright", "Copyright 2024, Intel Corporation. All rights reserved.\0"
5555
VALUE "LegalTrademarks", "\0"
5656
VALUE "OriginalFilename", "umf_proxy.dll\0"
5757
VALUE "ProductName", "Unified Memory Framework (UMF)\0"
58-
VALUE "ProductVersion", UMF_VERSION "\0"
58+
VALUE "ProductVersion", _UMF_VERSION "\0"
5959
VALUE "PrivateBuild", "\0"
6060
VALUE "SpecialBuild", "\0"
6161
END

0 commit comments

Comments
 (0)