summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-06-04 16:05:27 +0300
committermonty@narttu.mysql.fi <>2003-06-04 16:05:27 +0300
commit100a66e6cbb6598039fdd0c0b5e9f8ed6e1d025d (patch)
treec934efa152de5caa783757ffbd3353ed664d55d2 /include/my_global.h
parentf6a365a53218c4ba8d3b6c03088090f5878115ff (diff)
downloadmariadb-git-100a66e6cbb6598039fdd0c0b5e9f8ed6e1d025d.tar.gz
Added [mysqld-base-version] as a default group for the mysqld server
Portability fix for Windows 64
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 90c4801e807..1026e8e3940 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -848,7 +848,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */
*/
/* Optimized store functions for Intel x86 */
-#ifdef __i386__
+#if defined(__i386__) && !defined(_WIN64)
#define sint2korr(A) (*((int16 *) (A)))
#define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \
(((uint32) 255L << 24) | \