Skip to content

Define NO_SHLWAPI_STRFCNS to not define StrCat #1508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hiroyuki-komatsu merged 1 commit into from
Jun 8, 2026
Merged

Define NO_SHLWAPI_STRFCNS to not define StrCat #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ cc_library(
"_ATL_NO_HOSTING",
"ID_TRACE_LEVEL=1",
"_MIDL_USE_GUIDDEF_",
"NO_SHLWAPI_STRFCNS",
"PSAPI_VERSION=2",
"UNICODE",
"_UNICODE",
Expand Down
2 changes: 0 additions & 2 deletions src/base/file/recursive.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@
#include <ftw.h>
#endif // __ANDROID__ || TARGET_OS_IPHONE

#undef StrCat

namespace mozc::file {

#ifdef _WIN32
Expand Down
5 changes: 0 additions & 5 deletions src/base/win32/win_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@
#include "base/vlog.h"
#include "base/win32/wide_char.h"

// Disable StrCat macro to use absl::StrCat.
#ifdef StrCat
#undef StrCat
#endif // StrCat

namespace mozc {
namespace {

Expand Down
2 changes: 0 additions & 2 deletions src/renderer/win32/win32_image_util_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@

#include <cstdlib>

#undef StrCat

#include <cstddef>
#include <cstdint>
#include <memory>
Expand Down
2 changes: 0 additions & 2 deletions src/renderer/win32/win32_renderer_util_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
#include <atltypes.h>
#include <windows.h>

#undef StrCat // b/328804050

#include <bit>
#include <cstdint>
#include <memory>
Expand Down
2 changes: 0 additions & 2 deletions src/win32/custom_action/custom_action.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
#include <wow64apiset.h>
// clang-format on

#undef StrCat // NOLINT: TODO: triggers clang-tidy, defined by windows.h.

#include <cstdarg>
#include <cstddef>
#include <memory>
Expand Down