diff options
author | unknown <monty@narttu.mysql.fi> | 2003-06-04 16:05:27 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-06-04 16:05:27 +0300 |
commit | a91d2fcbd9d927deb8808c10a32f1baa192a4e26 (patch) | |
tree | c934efa152de5caa783757ffbd3353ed664d55d2 /include/my_global.h | |
parent | 3f7dfc4df3a9bdfc01e5b84c3297fff61b791f9b (diff) | |
download | mariadb-git-a91d2fcbd9d927deb8808c10a32f1baa192a4e26.tar.gz |
Added [mysqld-base-version] as a default group for the mysqld server
Portability fix for Windows 64
include/config-win.h:
Portability fix for Windows 64
include/my_global.h:
Portability fix for Windows 64
include/mysql_version.h.in:
Added [mysqld-base-version] as a default group for the mysqld server
innobase/include/univ.i:
Portability fix for Windows 64
sql/mysqld.cc:
Added [mysqld-base-version] as a default group for the mysqld server
Diffstat (limited to 'include/my_global.h')
-rw-r--r-- | include/my_global.h | 2 |
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) | \ |