summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core/CxaDemangle.cpp
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2016-08-09 23:06:08 +0000
committerZachary Turner <zturner@google.com>2016-08-09 23:06:08 +0000
commitf343968f5d87a91e020a5baf03c280ce7aa9cdb1 (patch)
tree435027dd511241ce0ff6c4791e37c87648c35697 /lldb/source/Core/CxaDemangle.cpp
parentcef001aaaa679665f9ca59873ca954c161f90ca5 (diff)
downloadbcm5719-llvm-f343968f5d87a91e020a5baf03c280ce7aa9cdb1.tar.gz
bcm5719-llvm-f343968f5d87a91e020a5baf03c280ce7aa9cdb1.zip
Delete Host/windows/win32.h
It's always hard to remember when to include this file, and when you do include it it's hard to remember what preprocessor check it needs to be behind, and then you further have to remember whether it's windows.h or win32.h which you need to include. This patch changes the name to PosixApi.h, which is more appropriately named, and makes it independent of any preprocessor setting. There's still the issue of people not knowing when to include this, because there's not a well-defined set of things it exposes other than "whatever is missing on Windows", but at least this should make it less painful to fix when problems arise. This patch depends on LLVM revision r278170. llvm-svn: 278177
Diffstat (limited to 'lldb/source/Core/CxaDemangle.cpp')
-rw-r--r--lldb/source/Core/CxaDemangle.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/lldb/source/Core/CxaDemangle.cpp b/lldb/source/Core/CxaDemangle.cpp
index 62335a9175c..4bb0af52e20 100644
--- a/lldb/source/Core/CxaDemangle.cpp
+++ b/lldb/source/Core/CxaDemangle.cpp
@@ -10,16 +10,15 @@
// - Added "#undef _LIBCPP_EXTERN_TEMPLATE" to avoid warning
// - Implemented missing rebind, construct, destroy in malloc_alloc
// - Replaced noexcept, constexpr, alignas with their LLVM_* equivalents
-// - Included win32.h for snprintf implementation for MSVC
+// - Included PosixApi.h for snprintf implementation for MSVC
// - Removed constexpr member initialization for MSVC
// - Changed argument to alignas() to a literal for MSVC
// - Include <cstdio> for fprintf, stderr like entities.
//----------------------------------------------------------------------
-#if defined(_MSC_VER)
-#include "lldb/Host/windows/win32.h" // snprintf
-#endif
#include "llvm/Support/Compiler.h" // LLVM_{NOEXCEPT, CONSTEXPR, ALIGNAS}
+
+#include "lldb/Host/PosixApi.h"
#include "lldb/lldb-private.h"
#undef _LIBCPP_EXTERN_TEMPLATE // Avoid warning below
OpenPOWER on IntegriCloud