diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-02-01 15:48:02 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-02-01 15:48:02 -0800 |
| commit | 7b79d8a33f56d178c78209f910a0694807a63f8f (patch) | |
| tree | 3d4a8131e8688c6599461bfce72bb87c718a53e4 /include | |
| parent | 7ed15e6e50aec65560d8988fc5713f1f489b6616 (diff) | |
| parent | 81690cf326e09799ca77d9f7bc5601905b706548 (diff) | |
| download | mariadb-git-7b79d8a33f56d178c78209f910a0694807a63f8f.tar.gz | |
Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/config-win.h b/include/config-win.h index c2a00f319ae..da93251ec90 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -45,8 +45,8 @@ #define MACHINE_TYPE "ia64" #elif defined(_M_IX86) #define MACHINE_TYPE "ia32" -#elif defined(_M_ALPHA) -#define MACHINE_TYPE "axp" +#elif defined(_M_X64) +#define MACHINE_TYPE "x64" #else #define MACHINE_TYPE "unknown" /* Define to machine type name */ #endif |