diff options
| author | unknown <petr@mysql.com> | 2005-02-17 04:23:48 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-02-17 04:23:48 +0300 |
| commit | 31bec292632fb0b77ef20804fea334474e07e326 (patch) | |
| tree | 871afdbf8d17ee346faa1777e905e3e55556a91d /include | |
| parent | 83cce1caa4db636b34639d5f22f4b8512d6121dd (diff) | |
| parent | 1fbeaf710ab4e1b8f532e82c6d304dd1be59e614 (diff) | |
| download | mariadb-git-31bec292632fb0b77ef20804fea334474e07e326.tar.gz | |
Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review
Diffstat (limited to 'include')
| -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 |