diff options
| author | Roman Divacky <rdivacky@FreeBSD.org> | 2009-11-04 14:58:56 +0000 |
|---|---|---|
| committer | Roman Divacky <rdivacky@FreeBSD.org> | 2009-11-04 14:58:56 +0000 |
| commit | 36bf506ad3c99a309ca8bd73bd03563d8d068ac0 (patch) | |
| tree | b4dc751bcee540346911aa4115729eff2f991657 /lib/System/Unix | |
| parent | f9666f9b3a3d26810deae8cd54feb6e47ecee61a (diff) | |
Diffstat (limited to 'lib/System/Unix')
| -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 |
3 files changed, 5 insertions, 3 deletions
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); |