try fixing compilation on windows (microsoft/cppwinrt#479)

jungikim · Feb 3, 2024 · 103e827 · 103e827
1 parent 920630a
commit 103e827
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 0 deletions.
diff --git a/mecab/src/iconv_utils.cpp b/mecab/src/iconv_utils.cpp
@@ -19,6 +19,9 @@
 #include "iconv_utils.h"
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include "windows.h"
 #endif
 

diff --git a/mecab/src/iconv_utils.h b/mecab/src/iconv_utils.h
@@ -11,6 +11,9 @@
 #endif
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include "windows.h"
 #endif
 

diff --git a/mecab/src/libmecab.cpp b/mecab/src/libmecab.cpp
@@ -4,6 +4,9 @@
 //  Copyright(C) 2001-2006 Taku Kudo <[email protected]>
 //  Copyright(C) 2004-2006 Nippon Telegraph and Telephone Corporation
 #if defined(_WIN32) && !defined(__CYGWIN__)
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 #endif
 

diff --git a/mecab/src/mecab.h b/mecab/src/mecab.h
@@ -336,6 +336,9 @@ extern "C" {
 #endif
 
 #ifdef _WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 #  ifdef DLL_EXPORT
 #    define MECAB_DLL_EXTERN  __declspec(dllexport)

diff --git a/mecab/src/mmap.h b/mecab/src/mmap.h
@@ -33,6 +33,9 @@ extern "C" {
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #ifdef HAVE_WINDOWS_H
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 #endif
 #else

diff --git a/mecab/src/thread.h b/mecab/src/thread.h
@@ -14,6 +14,9 @@
 #include <pthread.h>
 #else
 #ifdef _WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 #include <process.h>
 #endif

diff --git a/mecab/src/utils.cpp b/mecab/src/utils.cpp
@@ -20,7 +20,9 @@
 #endif
 
 #ifdef HAVE_WINDOWS_H
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <stdlib.h>
 #endif

diff --git a/mecab/src/winmain.h b/mecab/src/winmain.h
@@ -4,6 +4,9 @@
 //  Copyright(C) 2004-2006 Nippon Telegraph and Telephone Corporation
 #if defined(_WIN32) || defined(__CYGWIN__)
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 #include <string>