Commit 09f58751 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

Revert "Googletest export"

This reverts commit a9f6c1ed.

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 a9f6c1ed 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.
parent a09ea700
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
#elif GTEST_OS_WINDOWS // We are on Windows proper. #elif GTEST_OS_WINDOWS // We are on Windows proper.
# include <Windows.h> // NOLINT
# include <windows.h> // NOLINT # include <windows.h> // NOLINT
# undef min # undef min
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment