diff options
| author | acurtis@pcgem.rdg.cyberkinetica.com <> | 2005-02-16 16:29:56 +0000 |
|---|---|---|
| committer | acurtis@pcgem.rdg.cyberkinetica.com <> | 2005-02-16 16:29:56 +0000 |
| commit | b119963f133a1e8427a2ac6bcb3e49633a15b554 (patch) | |
| tree | 8168e5e887697003be4c591f67133c7127efa1ad /include/config-win.h | |
| parent | 44ceb84cdc86f65f9f43424ee1300bb8f162f24b (diff) | |
| parent | aecc58b3d8cc448c789ac34567f9ae3388e4ddc1 (diff) | |
| download | mariadb-git-b119963f133a1e8427a2ac6bcb3e49633a15b554.tar.gz | |
Merge
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 946a91d7d42..66a441ec339 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 |