diff options
| author | Martin Storsjö <martin@martin.st> | 2020-05-08 07:13:33 (GMT) |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2020-05-08 07:13:33 (GMT) |
| commit | 09f587512a761eed4b33069456020680b320e7af (patch) | |
| tree | 5db8c2e469555be8c25028e15cd541bfc2d9e3fd | |
| parent | a09ea700d32bab83325aff9ff34d0582e50e3997 (diff) | |
| download | googletest-09f587512a761eed4b33069456020680b320e7af.zip googletest-09f587512a761eed4b33069456020680b320e7af.tar.gz googletest-09f587512a761eed4b33069456020680b320e7af.tar.bz2 | |
Revert "Googletest export"
This reverts commit a9f6c1ed1401dd9b002d4c43fb9f946d2c7466d0.
That commit cannot fix the issue it sets out to fix.
The original issue, #2822, was that building with a toolset
targeting XP compatibility is missing the debugapi.h header -
as debugapi.h didn't exist in older Windows SDKs.
Commit a9f6c1ed1401dd9b002d4c43fb9f946d2c7466d0 misinterpreted
the Microsoft documentation about IsDebuggerPresent. The information
about which header to use, "debugapi.h (include Windows.h)" means
that the function declaration currently lives in debugapi.h, but
for compatibility, just include the Windows.h umbrella header.
In older Windows SDKs (e.g. the v6.0a SDK), IsDebuggerPresent
is declared in winbase.h, and debugapi.h doesn't exist at all in those
versions.
Including Windows.h with a different capitalization than the existing
include won't help finding headers that don't exist.
Including Windows.h with a capital W breaks cross compilation with mingw
toolchains, where the header always has been spelled with a lower case
W. When building on native windows, the file system is case insensitive
and the capitalization doesn't matter.
This fixes issue #2840.
| -rw-r--r-- | googletest/src/gtest.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index c672280..7282719 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -81,7 +81,6 @@ #elif GTEST_OS_WINDOWS // We are on Windows proper. -# include <Windows.h> // NOLINT # include <windows.h> // NOLINT # undef min |