From c96601d2a7a82ae1dc90cdf8d24c0925e90aa881 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 23 Oct 2014 22:40:37 +0000 Subject: [PATCH] internal.h (backtrace_atomic_load_pointer): Fix to return void *. * internal.h (backtrace_atomic_load_pointer) [no atomic or sync]: Fix to return void *. From-SVN: r216603 --- libbacktrace/ChangeLog | 5 +++++ libbacktrace/internal.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index adb54d8f5c3..8cc54be5d55 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,8 @@ +2014-10-23 Ian Lance Taylor + + * internal.h (backtrace_atomic_load_pointer) [no atomic or sync]: + Fix to return void *. + 2014-05-08 Ian Lance Taylor * mmap.c (backtrace_free): If freeing a large aligned block of diff --git a/libbacktrace/internal.h b/libbacktrace/internal.h index 1ae43177f38..bb967bc4a67 100644 --- a/libbacktrace/internal.h +++ b/libbacktrace/internal.h @@ -99,7 +99,7 @@ extern void backtrace_atomic_store_int (int *, int); /* We have neither the sync nor the atomic functions. These will never be called. */ -#define backtrace_atomic_load_pointer(p) (abort(), 0) +#define backtrace_atomic_load_pointer(p) (abort(), (void *) NULL) #define backtrace_atomic_load_int(p) (abort(), 0) #define backtrace_atomic_store_pointer(p, v) abort() #define backtrace_atomic_store_size_t(p, v) abort() -- 2.30.2