Changes from teg@redhat.com - subtle bugs that only show up under

certain circumstances.

1 files changed, 8 insertions, 4 deletions

diff --git a/include/global.h b/include/global.h
index 0934f2931fd..006a0173c34 100644
--- a/include/global.h
+++ b/include/global.h
@@ -682,10 +682,14 @@ typedef char		bool;	/* Ordinary boolean values 0 1 */
 			  *((T)+4)=(uchar) (((A) >> 32)); }
 #define int8store(T,A)	*((ulonglong *) (T))= (ulonglong) (A)
 
-#define doubleget(V,M)	{ *((long *) &V) = *((long*) M); \
-			  *(((long *) &V)+1) = *(((long*) M)+1); }
-#define doublestore(T,V) { *((long *) T) = *((long*) &V); \
-			   *(((long *) T)+1) = *(((long*) &V)+1); }
+typedef union {
+  double v;
+  long m[2];
+} doubleget_union;
+#define doubleget(V,M)	{ ((doubleget_union *)&V)->m[0] = *((long*) M); \
+			  ((doubleget_union *)&V)->m[1] = *(((long*) M)+1); }
+#define doublestore(T,V) { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
+			   *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; }
 #define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); }
 #define float8get(V,M) doubleget((V),(M))
 #define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))