diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-13 15:28:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-13 15:28:02 (GMT) |
| commit | 9f351b93ab7684940ad2da14fd6800f11f09355f (patch) | |
| tree | 92dc4cec91641ef5f747840df963d7ce3a1dc8af | |
| parent | 30783addc12d82081575f5a7577d7b4953cbd55c (diff) | |
| parent | 76a5ac210050e0c1ccdce8ce89a0c77579e30187 (diff) | |
| download | CMake-9f351b93ab7684940ad2da14fd6800f11f09355f.zip CMake-9f351b93ab7684940ad2da14fd6800f11f09355f.tar.gz CMake-9f351b93ab7684940ad2da14fd6800f11f09355f.tar.bz2 | |
Merge branch 'fix-pointer-truncation' into release-3.14
Merge-request: !2956
| -rw-r--r-- | Source/LexerParser/cmListFileLexer.c | 2 | ||||
| -rw-r--r-- | Source/LexerParser/cmListFileLexer.in.l | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/LexerParser/cmListFileLexer.c b/Source/LexerParser/cmListFileLexer.c index c726415..15dcda0 100644 --- a/Source/LexerParser/cmListFileLexer.c +++ b/Source/LexerParser/cmListFileLexer.c @@ -766,7 +766,7 @@ Modify cmListFileLexer.c: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifdef WIN32 +#ifdef _WIN32 #include "cmsys/Encoding.h" #endif diff --git a/Source/LexerParser/cmListFileLexer.in.l b/Source/LexerParser/cmListFileLexer.in.l index 6a6fb5f..fdf14d2 100644 --- a/Source/LexerParser/cmListFileLexer.in.l +++ b/Source/LexerParser/cmListFileLexer.in.l @@ -18,7 +18,7 @@ Modify cmListFileLexer.c: /* IWYU pragma: no_forward_declare yyguts_t */ -#ifdef WIN32 +#ifdef _WIN32 #include "cmsys/Encoding.h" #endif |