diff options
| author | iggy@alf.(none) <> | 2008-02-28 23:53:01 -0500 |
|---|---|---|
| committer | iggy@alf.(none) <> | 2008-02-28 23:53:01 -0500 |
| commit | 52d337bae802ec916ebf94aa16ba6ae996246861 (patch) | |
| tree | cf8308ffdf8d9b99cfaa5ad652e4bcb3949f5d74 /include | |
| parent | 09cd3d01e4f8ee31e2d6ab643f0932750df41cca (diff) | |
| download | mariadb-git-52d337bae802ec916ebf94aa16ba6ae996246861.tar.gz | |
Bug #24992 Enabling Shared Memory support on Windows x64 causes client to fail
- Mistaken macro defintions cause mysys to read packets in the wrong order.
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 e05100fa288..f290b690630 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1053,7 +1053,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) | \ @@ -1242,7 +1242,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) |