[logging-log4cxx] branch LOGCXX-510 updated: Build on windows

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmiddleton pushed a commit to branch LOGCXX-510
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


The following commit(s) were added to refs/heads/LOGCXX-510 by this push:
     new d114da0  Build on windows
d114da0 is described below

commit d114da0d6ac494ff9074ac2460849984a98dd6db
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Fri Nov 5 21:02:46 2021 -0400

    Build on windows
---
 src/main/cpp/cacheddateformat.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/cpp/cacheddateformat.cpp b/src/main/cpp/cacheddateformat.cpp
index 2b6df72..9b8df53 100644
--- a/src/main/cpp/cacheddateformat.cpp
+++ b/src/main/cpp/cacheddateformat.cpp
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 #define __STDC_CONSTANT_MACROS
+#define NOMINMAX /* tell wnidows not to define min/max macros */
 #include <log4cxx/logstring.h>
 #include <log4cxx/helpers/cacheddateformat.h>
 
@@ -115,8 +116,6 @@ const logchar CachedDateFormat::magicString2[] = { 0x39, 0x38, 0x37, 0};
  */
 const logchar CachedDateFormat::zeroString[] = { 0x30, 0x30, 0x30, 0 };
 
-#undef min
-
 /**
  *  Creates a new CachedDateFormat object.
  *  @param dateFormat Date format, may not be null.