diff options
Diffstat (limited to 'lib/System')
| -rw-r--r-- | lib/System/DynamicLibrary.cpp | 1 | ||||
| -rw-r--r-- | lib/System/Path.cpp | 1 | ||||
| -rw-r--r-- | lib/System/Unix/Memory.inc | 2 | ||||
| -rw-r--r-- | lib/System/Unix/Process.inc | 4 | ||||
| -rw-r--r-- | lib/System/Unix/Signals.inc | 2 | ||||
| -rw-r--r-- | lib/System/Win32/Memory.inc | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp index 6efab948fa76..7eb9f5f3ef8e 100644 --- a/lib/System/DynamicLibrary.cpp +++ b/lib/System/DynamicLibrary.cpp @@ -15,7 +15,6 @@ //===----------------------------------------------------------------------===// #include "llvm/System/DynamicLibrary.h" -#include "llvm/Support/ManagedStatic.h" #include "llvm/Config/config.h" #include <cstdio> #include <cstring> diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp index df3357480937..8e1fa538b7b7 100644 --- a/lib/System/Path.cpp +++ b/lib/System/Path.cpp @@ -13,7 +13,6 @@ #include "llvm/System/Path.h" #include "llvm/Config/config.h" -#include "llvm/Support/ErrorHandling.h" #include <cassert> #include <cstring> #include <ostream> diff --git a/lib/System/Unix/Memory.inc b/lib/System/Unix/Memory.inc index a80f56fbc144..1b038f9c6e0b 100644 --- a/lib/System/Unix/Memory.inc +++ b/lib/System/Unix/Memory.inc @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "Unix.h" -#include "llvm/Support/DataTypes.h" +#include "llvm/System/DataTypes.h" #include "llvm/System/Process.h" #ifdef HAVE_SYS_MMAN_H diff --git a/lib/System/Unix/Process.inc b/lib/System/Unix/Process.inc index 94e4c1bde25c..911b8c325819 100644 --- a/lib/System/Unix/Process.inc +++ b/lib/System/Unix/Process.inc @@ -18,7 +18,9 @@ #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> #endif -#ifdef HAVE_MALLOC_H +// DragonFly BSD has deprecated <malloc.h> for <stdlib.h> instead, +// Unix.h includes this for us already. +#if defined(HAVE_MALLOC_H) && !defined(__DragonFly__) #include <malloc.h> #endif #ifdef HAVE_MALLOC_MALLOC_H diff --git a/lib/System/Unix/Signals.inc b/lib/System/Unix/Signals.inc index d39e1e99a0c5..676e1e5356c8 100644 --- a/lib/System/Unix/Signals.inc +++ b/lib/System/Unix/Signals.inc @@ -209,7 +209,7 @@ static void PrintStackTrace(void *) { Dl_info dlinfo; dladdr(StackTrace[i], &dlinfo); - fprintf(stderr, "%-3d", i); + fprintf(stderr, "%-2d", i); const char* name = strrchr(dlinfo.dli_fname, '/'); if (name == NULL) fprintf(stderr, " %-*s", width, dlinfo.dli_fname); diff --git a/lib/System/Win32/Memory.inc b/lib/System/Win32/Memory.inc index 7611ecdb929a..19fccbddc26b 100644 --- a/lib/System/Win32/Memory.inc +++ b/lib/System/Win32/Memory.inc @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "Win32.h" -#include "llvm/Support/DataTypes.h" +#include "llvm/System/DataTypes.h" #include "llvm/System/Process.h" namespace llvm { |