diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-08 04:54:15 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-08 04:54:15 +0200 |
| commit | 61d3edba811967e0da3ae6ec3507fb6d723125ba (patch) | |
| tree | 130273cf83fbf8f828bd4bb0bf7533c618233afa | |
| parent | 71743a7c4d6658c5776169c4179796e7c24d58fd (diff) | |
| parent | 6d4d727efbd961db59abd6cadf8dfb9856974093 (diff) | |
| download | mariadb-git-61d3edba811967e0da3ae6ec3507fb6d723125ba.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/myisampack.h | 2 | ||||
| -rw-r--r-- | sql/field.cc | 4 | ||||
| -rw-r--r-- | sql/filesort.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/global.h b/include/global.h index 657229497be..2ad4a1387a9 100644 --- a/include/global.h +++ b/include/global.h @@ -812,7 +812,7 @@ typedef union { #define float4get(V,M) memcpy_fixed((byte*) &V,(byte*) (M),sizeof(float)) #define float4store(V,M) memcpy_fixed((byte*) V,(byte*) (&M),sizeof(float)) -#if (__FLOAT_WORD_ORDER == __BIG_ENDIAN) +#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN) #define doublestore(T,V) { *(T)= ((byte *) &V)[4];\ *((T)+1)=(char) ((byte *) &V)[5];\ *((T)+2)=(char) ((byte *) &V)[6];\ diff --git a/include/myisampack.h b/include/myisampack.h index 376737ad83e..a51cdc7e6eb 100644 --- a/include/myisampack.h +++ b/include/myisampack.h @@ -167,7 +167,7 @@ ((byte*) &def_temp)[3]=(M)[0];\ (V)=def_temp; } -#if (__FLOAT_WORD_ORDER == __BIG_ENDIAN) +#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN) #define mi_float8store(T,V) { *(T)= ((byte *) &V)[3];\ *((T)+1)=(char) ((byte *) &V)[2];\ *((T)+2)=(char) ((byte *) &V)[1];\ diff --git a/sql/field.cc b/sql/field.cc index 383b3f7776d..17717b14649 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -2107,7 +2107,7 @@ int Field_double::cmp(const char *a_ptr, const char *b_ptr) #endif { /* could this ALWAYS be 2 calls to doubleget() ?? */ -#if (__FLOAT_WORD_ORDER == __BIG_ENDIAN) +#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN) doubleget(a, a_ptr); doubleget(b, b_ptr); #else @@ -2134,7 +2134,7 @@ void Field_double::sort_string(char *to,uint length __attribute__((unused))) else #endif /* could this ALWAYS be 2 calls to doubleget() ?? */ -#if (__FLOAT_WORD_ORDER == __BIG_ENDIAN) +#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN) doubleget(nr,ptr); #else memcpy_fixed(&nr,ptr,sizeof(nr)); diff --git a/sql/filesort.cc b/sql/filesort.cc index 0d862417af0..4a981040968 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -932,7 +932,7 @@ void change_double_for_sort(double nr,byte *to) #else { uchar *ptr= (uchar*) &nr; -#if (__FLOAT_WORD_ORDER == __BIG_ENDIAN) +#if defined(__FLOAT_WORD_ORDER) && (__FLOAT_WORD_ORDER == __BIG_ENDIAN) tmp[0]= ptr[3]; tmp[1]=ptr[2]; tmp[2]= ptr[1]; tmp[3]=ptr[0]; tmp[4]= ptr[7]; tmp[5]=ptr[6]; tmp[6]= ptr[5]; tmp[7]=ptr[4]; #else |