summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorkent@mysql.com <>2006-06-30 02:49:28 +0200
committerkent@mysql.com <>2006-06-30 02:49:28 +0200
commit593b359d92963f2a31d843effaeb4e2f017b6f97 (patch)
tree979022ec6de7b83cb460624acaf39da5ca896175 /include
parent6f6b966d16e6eb2f7c1d5e592fd87126e65a12a9 (diff)
downloadmariadb-git-593b359d92963f2a31d843effaeb4e2f017b6f97.tar.gz
mysql.spec.sh:
Disable old RPM strip my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) mysqlmanager.vcproj: Place output files in common release/debug directory
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h
index c9f27e0031e..909755aef87 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1071,8 +1071,8 @@ do { doubleget_union _tmp; \
#define doublestore(T,V) do { *((long *) T) = ((doubleget_union *)&V)->m[0]; \
*(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; \
} while (0)
-#define float4get(V,M) do { *((long *) &(V)) = *((long*) (M)); } while(0)
-#define float8get(V,M) doubleget((V),(M))
+#define float4get(V,M) do { *((float *) &(V)) = *((float*) (M)); } while(0)
+#define float8get(V,M) doubleget((V),(M))
#define float4store(V,M) memcpy((byte*) V,(byte*) (&M),sizeof(float))
#define floatstore(T,V) memcpy((byte*)(T), (byte*)(&V),sizeof(float))
#define floatget(V,M) memcpy((byte*) &V,(byte*) (M),sizeof(float))