This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/next_stable by this push:
new 44164468 Prevent 'macro redefinition' compiler warning when using a
MSVC compiler
44164468 is described below
commit 4416446861919eb3a3690ac3da9daedfef3df713
Author: Stephen Webb <[email protected]>
AuthorDate: Mon Aug 15 16:46:49 2022 +1000
Prevent 'macro redefinition' compiler warning when using a MSVC compiler
---
src/main/include/log4cxx/private/log4cxx_private.h.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/include/log4cxx/private/log4cxx_private.h.in
b/src/main/include/log4cxx/private/log4cxx_private.h.in
index 26281e07..55c6844e 100644
--- a/src/main/include/log4cxx/private/log4cxx_private.h.in
+++ b/src/main/include/log4cxx/private/log4cxx_private.h.in
@@ -35,7 +35,11 @@
#define LOG4CXX_HAS_STD_LOCALE @HAS_STD_LOCALE@
#define LOG4CXX_FORCE_WIDE_CONSOLE 0
#define LOG4CXX_FORCE_BYTE_CONSOLE 0
+#if defined(_MSC_VER)
+#define LOG4CXX_MEMSET_IOS_BASE 1
+#else
#define LOG4CXX_MEMSET_IOS_BASE 0
+#endif
#define LOG4CXX_HAVE_ODBC @HAS_ODBC@
#define LOG4CXX_HAS_MBSRTOWCS @HAS_MBSRTOWCS@
#define LOG4CXX_HAS_WCSTOMBS @HAS_WCSTOMBS@
@@ -69,8 +73,4 @@
#define LOG4CXX_THREAD_LOCAL thread_local
#endif
-#if defined(_MSC_VER)
-#define LOG4CXX_MEMSET_IOS_BASE 1
-#endif
-
#endif
