From 46031e6fecf334ebf0f867cc84430f1c927c7591 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 7 Sep 2016 08:46:50 +0000 Subject: [PATCH] Fix unittest compilation on windows After the reformat, the unittests do not compile due to missing due to redefinition errors between PosixApi.h and ucrt/direct.h. This is a bit of a shot in the dark, as I have not tested it on windows, but I am restoring the original include order, so it should hopefully fix it. llvm-svn: 280793 --- lldb/unittests/Host/SymbolsTest.cpp | 3 ++- lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp | 1 - lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp | 1 - lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.h | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lldb/unittests/Host/SymbolsTest.cpp b/lldb/unittests/Host/SymbolsTest.cpp index ba100bd..d307331 100644 --- a/lldb/unittests/Host/SymbolsTest.cpp +++ b/lldb/unittests/Host/SymbolsTest.cpp @@ -7,9 +7,10 @@ // //===----------------------------------------------------------------------===// +#include "gtest/gtest.h" + #include "lldb/Host/Symbols.h" #include "lldb/Core/ModuleSpec.h" -#include "gtest/gtest.h" using namespace lldb_private; diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp index 6039794..c9d4544 100644 --- a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp +++ b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp @@ -16,7 +16,6 @@ #include #include "GDBRemoteTestUtils.h" -#include "gtest/gtest.h" #include "Plugins/Process/Utility/LinuxSignals.h" #include "Plugins/Process/gdb-remote/GDBRemoteClientBase.h" diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp b/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp index d74ac66..c5d41ae 100644 --- a/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp +++ b/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp @@ -16,7 +16,6 @@ #include #include "GDBRemoteTestUtils.h" -#include "gtest/gtest.h" #include "Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h" #include "lldb/Core/DataBuffer.h" diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.h b/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.h index 2aad2ae..f4fc92c 100644 --- a/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.h +++ b/lldb/unittests/Process/gdb-remote/GDBRemoteTestUtils.h @@ -9,9 +9,10 @@ #ifndef lldb_unittests_Process_gdb_remote_GDBRemoteTestUtils_h #define lldb_unittests_Process_gdb_remote_GDBRemoteTestUtils_h -#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h" #include "gtest/gtest.h" +#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h" + namespace lldb_private { namespace process_gdb_remote { -- 2.7.4