From bdecf7785e476cfe0938c5b3c47805eb55d0e2ed Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Tue, 18 Sep 2018 08:44:57 +0000 Subject: [PATCH] [benchmark] Lowercase windows specific includes The windows SDK headers don't have self-consistent casing anyway, so we consistently use lowercase for these in other places, in order to fix crosscompilation with mingw headers. This applies an upstream commit: https://github.com/google/benchmark/commit/52613079824ac58d06c070aa9fbbb186a5859e2c Differential Revision: https://reviews.llvm.org/D52181 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342450 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/benchmark/src/colorprint.cc | 2 +- utils/benchmark/src/sleep.cc | 2 +- utils/benchmark/src/sysinfo.cc | 6 +++--- utils/benchmark/src/timers.cc | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/benchmark/src/colorprint.cc b/utils/benchmark/src/colorprint.cc index 2dec4a8b28b..fff6a98818b 100644 --- a/utils/benchmark/src/colorprint.cc +++ b/utils/benchmark/src/colorprint.cc @@ -25,7 +25,7 @@ #include "internal_macros.h" #ifdef BENCHMARK_OS_WINDOWS -#include +#include #include #else #include diff --git a/utils/benchmark/src/sleep.cc b/utils/benchmark/src/sleep.cc index 54aa04a4224..1512ac90f7e 100644 --- a/utils/benchmark/src/sleep.cc +++ b/utils/benchmark/src/sleep.cc @@ -21,7 +21,7 @@ #include "internal_macros.h" #ifdef BENCHMARK_OS_WINDOWS -#include +#include #endif namespace benchmark { diff --git a/utils/benchmark/src/sysinfo.cc b/utils/benchmark/src/sysinfo.cc index b76d0b9c868..29f4eb677be 100644 --- a/utils/benchmark/src/sysinfo.cc +++ b/utils/benchmark/src/sysinfo.cc @@ -15,10 +15,10 @@ #include "internal_macros.h" #ifdef BENCHMARK_OS_WINDOWS -#include +#include #undef StrCat // Don't let StrCat in string_util.h be renamed to lstrcatA -#include -#include +#include +#include #else #include #ifndef BENCHMARK_OS_FUCHSIA diff --git a/utils/benchmark/src/timers.cc b/utils/benchmark/src/timers.cc index 2010e2450b4..7613ff92c6e 100644 --- a/utils/benchmark/src/timers.cc +++ b/utils/benchmark/src/timers.cc @@ -16,10 +16,10 @@ #include "internal_macros.h" #ifdef BENCHMARK_OS_WINDOWS -#include +#include #undef StrCat // Don't let StrCat in string_util.h be renamed to lstrcatA -#include -#include +#include +#include #else #include #ifndef BENCHMARK_OS_FUCHSIA -- 2.11.0