diff options
| author | Pavel Labath <labath@google.com> | 2016-09-07 08:46:50 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2016-09-07 08:46:50 +0000 |
| commit | 46031e6fecf334ebf0f867cc84430f1c927c7591 (patch) | |
| tree | 39376a76b43e65cd390c454a359898d4f2504297 /lldb/unittests/Process/gdb-remote | |
| parent | ec905a62ae26fd3b2064a15e31b9988a8d32589a (diff) | |
| download | bcm5719-llvm-46031e6fecf334ebf0f867cc84430f1c927c7591.tar.gz bcm5719-llvm-46031e6fecf334ebf0f867cc84430f1c927c7591.zip | |
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
Diffstat (limited to 'lldb/unittests/Process/gdb-remote')
3 files changed, 2 insertions, 3 deletions
diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp index 60397943a0e..c9d4544add2 100644 --- a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp +++ b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp @@ -16,7 +16,6 @@ #include <future> #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 d74ac66e15d..c5d41ae81f4 100644 --- a/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp +++ b/lldb/unittests/Process/gdb-remote/GDBRemoteCommunicationClientTest.cpp @@ -16,7 +16,6 @@ #include <future> #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 2aad2ae4972..f4fc92c9de2 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 { |
