diff options
| author | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2005-02-16 16:47:29 +0000 |
|---|---|---|
| committer | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2005-02-16 16:47:29 +0000 |
| commit | 36f6d8afee379355983ec3ea633c5e3c4447723b (patch) | |
| tree | ab028c21db70c48b4191ee1f15d900c9e5009976 /include/config-win.h | |
| parent | 1f6617562a5e9e22c0964abb08afb20288dd626d (diff) | |
| parent | dd13aeb7f3e65569d745992ee2f2fc29eb54a3d0 (diff) | |
| download | mariadb-git-36f6d8afee379355983ec3ea633c5e3c4447723b.tar.gz | |
Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
include/config-win.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/include/config-win.h b/include/config-win.h index cb2c072d056..9918f69a978 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -31,18 +31,25 @@ functions */ #define HAVE_SMEM 1 -#if defined(__NT__) -#define SYSTEM_TYPE "NT" -#elif defined(__WIN2000__) -#define SYSTEM_TYPE "WIN2000" +#if defined(_WIN64) || defined(WIN64) +#define SYSTEM_TYPE "Win64" +#elif defined(_WIN32) || defined(WIN32) +#define SYSTEM_TYPE "Win32" #else -#define SYSTEM_TYPE "Win95/Win98" +#define SYSTEM_TYPE "Windows" #endif -#if defined(_WIN64) || defined(WIN64) -#define MACHINE_TYPE "ia64" /* Define to machine type name */ +#if defined(_M_IA64) +#define MACHINE_TYPE "ia64" +#elif defined(_M_IX86) +#define MACHINE_TYPE "ia32" +#elif defined(_M_ALPHA) +#define MACHINE_TYPE "axp" #else -#define MACHINE_TYPE "i32" /* Define to machine type name */ +#define MACHINE_TYPE "unknown" /* Define to machine type name */ +#endif + +#if !(defined(_WIN64) || defined(WIN64)) #ifndef _WIN32 #define _WIN32 /* Compatible with old source */ #endif |