diff options
| author | Guenter Knauf <lists@gknw.net> | 2011-09-20 12:32:04 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2011-09-20 12:32:04 +0200 |
| commit | dee7a08f647b350c80627f27faa9b0216098cdc6 (patch) | |
| tree | 64399ddb1f83fa2b639abfbb744416aab6e37691 | |
| parent | cd3cf55b47332769a0e737feb9c5a6d48dce5de9 (diff) | |
Changed Windows 64bit OS define to x86_64.
Also added check for __x86_64__ define since MinGW64 seems to define
the _M_X64 macro through a header not available for config-win32.h.
| -rw-r--r-- | lib/config-win32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h index e498192f8..cfbca9ca3 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -653,10 +653,10 @@ #undef OS #if defined(_M_IX86) || defined(__i386__) /* x86 (MSVC or gcc) */ #define OS "i386-pc-win32" +#elif defined(_M_X64) || defined(__x86_64__) /* x86_64 (MSVC >=2005 or gcc) */ +#define OS "x86_64-pc-win32" #elif defined(_M_IA64) /* Itanium */ #define OS "ia64-pc-win32" -#elif defined(_M_X64) /* AMD64/EM64T - Not defined until MSVC 2005 */ -#define OS "amd64-pc-win32" #else #define OS "unknown-pc-win32" #endif |