diff options
| author | kostja@bodhi.local <> | 2006-07-13 22:09:36 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-07-13 22:09:36 +0400 |
| commit | d7845b74db59efb3bc8ffc74cbe3a3d7c5607196 (patch) | |
| tree | 42abdb25b1b2f8d856888f75545406d835075a65 /include | |
| parent | f6303a8cfb6aead0681ce33eac303eed454c659d (diff) | |
| parent | f62829636b5bdec183610acfba53ca18e0dd2f98 (diff) | |
| download | mariadb-git-d7845b74db59efb3bc8ffc74cbe3a3d7c5607196.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | include/my_handler.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/my_global.h b/include/my_global.h index 21b2251af1d..539a2ea644f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1159,8 +1159,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)) diff --git a/include/my_handler.h b/include/my_handler.h index d531e0fb3e1..61665090853 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -18,7 +18,6 @@ #ifndef _my_handler_h #define _my_handler_h -#include "my_global.h" #include "my_base.h" #include "m_ctype.h" #include "myisampack.h" |