diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2017-06-06 23:28:01 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2017-06-06 23:28:01 +0000 |
| commit | abd32bad374808ec5fd7ebd1b13f680879790ded (patch) | |
| tree | 5ec1f7042d2f98e0b569451f7cd7bf513a499c8f /llvm/lib/Fuzzer | |
| parent | c88f2c712f9a5a34210dd8f3d598274538e1090d (diff) | |
| download | bcm5719-llvm-abd32bad374808ec5fd7ebd1b13f680879790ded.tar.gz bcm5719-llvm-abd32bad374808ec5fd7ebd1b13f680879790ded.zip | |
Fix the includes in lib/Fuzzer on Windows that have ordering
dependencies and add comments to tell future maintainers about those
requirements.
llvm-svn: 304843
Diffstat (limited to 'llvm/lib/Fuzzer')
| -rw-r--r-- | llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/Fuzzer/FuzzerUtilWindows.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp b/llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp index f6c7e07cc61..321b3ec5d41 100644 --- a/llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp +++ b/llvm/lib/Fuzzer/FuzzerExtFunctionsDlsymWin.cpp @@ -13,9 +13,11 @@ #include "FuzzerExtFunctions.h" #include "FuzzerIO.h" -#include "Psapi.h" #include "Windows.h" +// This must be included after Windows.h. +#include "Psapi.h" + namespace fuzzer { ExternalFunctions::ExternalFunctions() { diff --git a/llvm/lib/Fuzzer/FuzzerUtilWindows.cpp b/llvm/lib/Fuzzer/FuzzerUtilWindows.cpp index 8d0678d7bf7..25ac976fc2d 100644 --- a/llvm/lib/Fuzzer/FuzzerUtilWindows.cpp +++ b/llvm/lib/Fuzzer/FuzzerUtilWindows.cpp @@ -12,7 +12,6 @@ #if LIBFUZZER_WINDOWS #include "FuzzerIO.h" #include "FuzzerInternal.h" -#include <Psapi.h> #include <cassert> #include <chrono> #include <cstring> @@ -24,6 +23,9 @@ #include <sys/types.h> #include <windows.h> +// This must be included after windows.h. +#include <Psapi.h> + namespace fuzzer { static const FuzzingOptions* HandlerOpt = nullptr; |
