diff --git a/src/iconv_utils.cpp b/src/iconv_utils.cpp index 759b6e2..8e0988b 100644 --- a/src/iconv_utils.cpp +++ b/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/src/iconv_utils.h b/src/iconv_utils.h index 1cd0cad..2a7429f 100644 --- a/src/iconv_utils.h +++ b/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/src/libmecab-ko.cpp b/src/libmecab-ko.cpp index db77a8c..3f53d5c 100644 --- a/src/libmecab-ko.cpp +++ b/src/libmecab-ko.cpp @@ -4,6 +4,9 @@ // Copyright(C) 2001-2006 Taku Kudo // Copyright(C) 2004-2006 Nippon Telegraph and Telephone Corporation #if defined(_WIN32) && !defined(__CYGWIN__) +#ifndef NOMINMAX +#define NOMINMAX +#endif #include #endif diff --git a/src/mecab-ko.h b/src/mecab-ko.h index 2dd6da3..359536a 100644 --- a/src/mecab-ko.h +++ b/src/mecab-ko.h @@ -336,6 +336,9 @@ extern "C" { #endif #ifdef _WIN32 +#ifndef NOMINMAX +#define NOMINMAX +#endif #include # ifdef DLL_EXPORT # define MECAB_KO_DLL_EXTERN __declspec(dllexport) diff --git a/src/mmap.h b/src/mmap.h index 5bcfd44..cb19c16 100644 --- a/src/mmap.h +++ b/src/mmap.h @@ -33,6 +33,9 @@ extern "C" { #if defined(_WIN32) && !defined(__CYGWIN__) #ifdef HAVE_WINDOWS_H +#ifndef NOMINMAX +#define NOMINMAX +#endif #include #endif #else diff --git a/src/thread.h b/src/thread.h index 14172a7..2b6f9b7 100644 --- a/src/thread.h +++ b/src/thread.h @@ -14,6 +14,9 @@ #include #else #ifdef _WIN32 +#ifndef NOMINMAX +#define NOMINMAX +#endif #include #include #endif diff --git a/src/utils.cpp b/src/utils.cpp index 906f9d6..0b0b113 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -20,7 +20,9 @@ #endif #ifdef HAVE_WINDOWS_H +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include #endif diff --git a/src/winmain.h b/src/winmain.h index 831abf2..bbd58be 100644 --- a/src/winmain.h +++ b/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 #include