diff options
| author | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2005-02-16 16:05:18 +0000 |
|---|---|---|
| committer | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2005-02-16 16:05:18 +0000 |
| commit | eab44eaaca1f0f7cb1b88cc979591fa21cbed78f (patch) | |
| tree | 7f003b91bcc484a934f55003125d07b119e85494 | |
| parent | c7b5773551ba41abda521f1b6e592258252431ee (diff) | |
| download | mariadb-git-eab44eaaca1f0f7cb1b88cc979591fa21cbed78f.tar.gz | |
Bug#4445
Make a more informative platform info for Windows
| -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 152e85c8e68..42aa23c3afe 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -23,18 +23,25 @@ #include <io.h> #include <malloc.h> -#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 |