diff options
| author | unknown <iggy@alf.(none)> | 2008-02-28 23:54:39 -0500 |
|---|---|---|
| committer | unknown <iggy@alf.(none)> | 2008-02-28 23:54:39 -0500 |
| commit | 968e781ec23420dac3587d15e7d5bc611573880a (patch) | |
| tree | 25e4a4de853a4a8a74b48b566551823dd486b2d0 /include | |
| parent | d01042ad4b461af56b92fb5785b68f652960e94d (diff) | |
| parent | 61caf4635d07d83b6aa0cddf9661c32dc0bee61a (diff) | |
| download | mariadb-git-968e781ec23420dac3587d15e7d5bc611573880a.tar.gz | |
Merge alf.(none):/src/macro_bugs/my50-macro_bugs
into alf.(none):/src/macro_bugs/my51-macro_bugs
include/my_global.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index f305709d94f..ef61324e9af 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1139,7 +1139,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ */ /* Optimized store functions for Intel x86 */ -#if defined(__i386__) || (defined(_WIN32) && !defined(_WIN64)) +#if defined(__i386__) || defined(_WIN32) #define sint2korr(A) (*((int16 *) (A))) #define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \ (((uint32) 255L << 24) | \ @@ -1354,7 +1354,7 @@ do { doubleget_union _tmp; \ #define float8store(V,M) doublestore((V),(M)) #endif /* WORDS_BIGENDIAN */ -#endif /* __i386__ OR _WIN32 AND !_WIN64 */ +#endif /* __i386__ OR _WIN32 */ /* Macro for reading 32-bit integer from network byte order (big-endian) |