* lisp.h (XFLOAT_DATA): Produce an rvalue by adding 0 to the value.

(XFLOAT_INIT): New macro for storing a float value.
* alloc.c (make_float, make_pure_float): Use XFLOAT_INIT.
* fns.c (sxhash): Copy out the value of a float in order to examine its bytes.
* dbusbind.c (xd_append_arg): Likewise.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lisp.h b/src/lisp.h
index b71bf524d1e..15de8d9e74f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1377,9 +1377,12 @@ struct Lisp_Float
   };
 
 #ifdef HIDE_LISP_IMPLEMENTATION
-#define XFLOAT_DATA(f)  (XFLOAT (f)->u.data_)
+#define XFLOAT_DATA(f)  (XFLOAT (f)->u.data_ + 0)
 #else
-#define XFLOAT_DATA(f)  (XFLOAT (f)->u.data)
+#define XFLOAT_DATA(f)  (XFLOAT (f)->u.data + 0)
+/* This should be used only in alloc.c, which always disables
+   HIDE_LISP_IMPLEMENTATION.  */
+#define XFLOAT_INIT(f,n) (XFLOAT (f)->u.data = (n))
 #endif
 
 /* A character, declared with the following typedef, is a member