Skip to content

Commit 4677418

Browse files
Merge pull request #1625 from vikhik/fix/windows-compile-with-ninja-clang
fix: windows compile with ninja/clang
2 parents 099017c + e82f06f commit 4677418

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/vsg/core/Export.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
1616
# pragma warning(disable : 4251)
1717
#endif
1818

19-
#if defined(WIN32)
19+
#if defined(_WIN32)
2020
# if defined(vsg_EXPORTS)
2121
# define VSG_DECLSPEC __declspec(dllexport)
2222
# elif defined(VSG_SHARED_LIBRARY)

src/vsg/io/FileSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
1717

1818
#include <cstdio>
1919

20-
#if defined(WIN32) && !defined(__CYGWIN__)
20+
#if defined(_WIN32) && !defined(__CYGWIN__)
2121
# include <cstdlib>
2222
# include <direct.h>
2323
# include <io.h>
@@ -223,7 +223,7 @@ Path vsg::executableFilePath()
223223
{
224224
Path path;
225225

226-
#if defined(WIN32)
226+
#if defined(_WIN32)
227227
TCHAR buf[PATH_MAX + 1];
228228
DWORD result = GetModuleFileName(NULL, buf, static_cast<DWORD>(std::size(buf) - 1));
229229
if (result && result < std::size(buf))

0 commit comments

Comments
 (0)