Skip to content

Commit 32041d9

Browse files
committed
Merge pull request #13 from kou/make-buildable-with-mingw
Make buildable with MinGW
2 parents 1f0fbe2 + 0b7a96a commit 32041d9

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

mecab/src/common.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,15 @@
8181
#define EXIT_SUCCESS 0
8282
#endif
8383

84-
#if defined(_WIN32) && !defined(__CYGWIN__)
85-
#define WPATH(path) (MeCab::Utf8ToWide(path).c_str())
84+
#ifdef _WIN32
85+
#ifdef __GNUC__
86+
#define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str())
87+
#define WPATH(path) (path)
88+
#else
89+
#define WPATH(path) WPATH_FORCE(path)
90+
#endif
8691
#else
92+
#define WPATH_FORCE(path) (path)
8793
#define WPATH(path) (path)
8894
#endif
8995

mecab/src/mmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ template <class T> class Mmap {
104104
CHECK_FALSE(false) << "unknown open mode:" << filename;
105105
}
106106

107-
hFile = ::CreateFileW(WPATH(filename), mode1, FILE_SHARE_READ, 0,
107+
hFile = ::CreateFileW(WPATH_FORCE(filename), mode1, FILE_SHARE_READ, 0,
108108
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
109109
CHECK_FALSE(hFile != INVALID_HANDLE_VALUE)
110110
<< "CreateFile() failed: " << filename;

0 commit comments

Comments
 (0)