diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-02-12 11:50:22 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-02-12 11:50:22 +0000 |
| commit | f51d6eb340bd52a4d6d3fe57bf6b6110f2b37eed (patch) | |
| tree | b31c6c72d6130dbb77cd2b212f014fc4304c0c0b /lib | |
| parent | dd5ff1bf41e1286fe230c1201ef81579767801bc (diff) | |
| download | llvm-f51d6eb340bd52a4d6d3fe57bf6b6110f2b37eed.tar.gz llvm-f51d6eb340bd52a4d6d3fe57bf6b6110f2b37eed.tar.bz2 llvm-f51d6eb340bd52a4d6d3fe57bf6b6110f2b37eed.tar.xz | |
Windows/Path.inc: Move <shlobj.h> after "Windows.h" for some API available.
I found that swapping the order of some header files helped fix a
build issue that we're seeing on mingw32. Without the swap, windows.h
was being included before _WIN32_WINNT was being defined and the
CreateHardLinkW function was #ifdef'd out.
It looks like the header is mainly used to get the SHGetFolderPathW
function, so I don't think that there'll be much fallout from the
switch.
Suggested by Alex Crichton. Thanks!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201230 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Support/Windows/Path.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc index a431fa0480..8329d271b3 100644 --- a/lib/Support/Windows/Path.inc +++ b/lib/Support/Windows/Path.inc @@ -19,12 +19,13 @@ #include "llvm/ADT/STLExtras.h" #include <fcntl.h> #include <io.h> -#include <shlobj.h> #include <sys/stat.h> #include <sys/types.h> -// The Windows.h header must be the last one included. +// These two headers must be included last, and make sure shlobj is required +// after Windows.h to make sure it picks up our definition of _WIN32_WINNT #include "Windows.h" +#include <shlobj.h> #undef max |