diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-23 22:40:37 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-23 22:40:37 +0000 |
| commit | f62ce0c7653193d9a031017496874093e779837b (patch) | |
| tree | d36b4d024d4c0b8227bd7a699bc166e17ebf2e76 /libbacktrace | |
| parent | 56242c27c8a93f8f585cc1af43c2ce46c0d36ab6 (diff) | |
* internal.h (backtrace_atomic_load_pointer) [no atomic or sync]:
Fix to return void *.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216603 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/ChangeLog | 5 | ||||
| -rw-r--r-- | libbacktrace/internal.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index adb54d8f5c3f..8cc54be5d55c 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,8 @@ +2014-10-23 Ian Lance Taylor <iant@google.com> + + * internal.h (backtrace_atomic_load_pointer) [no atomic or sync]: + Fix to return void *. + 2014-05-08 Ian Lance Taylor <iant@google.com> * mmap.c (backtrace_free): If freeing a large aligned block of diff --git a/libbacktrace/internal.h b/libbacktrace/internal.h index 1ae43177f380..bb967bc4a67e 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() |