diff options
-rw-r--r-- | libbacktrace/ChangeLog | 5 | ||||
-rw-r--r-- | libbacktrace/backtrace.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index b26da88223f..039e56f7aa0 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,5 +1,10 @@ 2018-04-17 Ian Lance Taylor <iant@golang.org> + * backtrace.c: Include backtrace-supported.h before checking + BACKTRACE_USES_MALLOC. + +2018-04-17 Ian Lance Taylor <iant@golang.org> + * backtrace.c (backtrace_full): When testing whether we can allocate memory, call mmap directly, and munmap the memory. diff --git a/libbacktrace/backtrace.c b/libbacktrace/backtrace.c index 319edcf12eb..5bcd370e378 100644 --- a/libbacktrace/backtrace.c +++ b/libbacktrace/backtrace.c @@ -35,13 +35,14 @@ POSSIBILITY OF SUCH DAMAGE. */ #include <unistd.h> #include <sys/types.h> +#include "backtrace-supported.h" + #if !BACKTRACE_USES_MALLOC #include <sys/mman.h> #endif #include "unwind.h" #include "backtrace.h" -#include "backtrace-supported.h" #include "internal.h" #ifndef MAP_ANONYMOUS |