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

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index adb54d8f5c3f8f86a923bbec9e0ee61c1faddefd..8cc54be5d55ce0717cb9d88bde84bebb4d090160 100644 (file)
--- 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 1ae43177f380ee831fe8055f0c1dc68c895499c2..bb967bc4a67e87dcb2ccb9901c494564c5d97750 100644 (file)
--- 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()