Skip to content

Commit

Permalink
Fixes for _UNICODE macro on Visual Studio (#2512)
Browse files Browse the repository at this point in the history
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

Co-authored-by: MiguelBarro <45819833+MiguelBarro@users.noreply.github.com>
  • Loading branch information
mergify[bot] and MiguelBarro authored Jul 15, 2022
1 parent c2cb8bd commit 6b318d0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/cpp/utils/StringMatching.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ bool StringMatching::matchPattern(
const char* pattern,
const char* str)
{
if (PathMatchSpec(str, pattern))
if (PathMatchSpecA(str, pattern))
{
return true;
}
Expand All @@ -110,11 +110,11 @@ bool StringMatching::matchString(
const char* str1,
const char* str2)
{
if (PathMatchSpec(str1, str2))
if (PathMatchSpecA(str1, str2))
{
return true;
}
if (PathMatchSpec(str2, str1))
if (PathMatchSpecA(str2, str1))
{
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/utils/SystemInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ReturnCode_t SystemInfo::get_username(
#define INFO_BUFFER_SIZE 32767
char user[INFO_BUFFER_SIZE];
DWORD bufCharCount = INFO_BUFFER_SIZE;
if (!GetUserName(user, &bufCharCount))
if (!GetUserNameA(user, &bufCharCount))
{
return ReturnCode_t::RETCODE_ERROR;
}
Expand Down

0 comments on commit 6b318d0

Please sign in to comment.