diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-08 04:43:55 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-08 04:43:55 +0200 |
| commit | 6d4d727efbd961db59abd6cadf8dfb9856974093 (patch) | |
| tree | 423a732474ddc20d41d3ade8d9dfec50f09ee1b9 /sql | |
| parent | 2f40648f2af055decc5971004936a6843b51da3c (diff) | |
| download | mariadb-git-6d4d727efbd961db59abd6cadf8dfb9856974093.tar.gz | |
Check that __FLOAT_WORD_ORDER is defined
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field.cc | 4 | ||||
| -rw-r--r-- | sql/filesort.cc | 2 |
2 files changed, 3 insertions, 3 deletions
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 |