From ee5d7a6e9f14cc2239bca876801fe9bdfb2e2913 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Thu, 10 Apr 2008 21:03:07 +0000 Subject: [PATCH] fix sys_info.arch on x64 --- src/os/win32/win32_sigar.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/os/win32/win32_sigar.c b/src/os/win32/win32_sigar.c index 670a25a6..c12fd7e0 100644 --- a/src/os/win32/win32_sigar.c +++ b/src/os/win32/win32_sigar.c @@ -3359,6 +3359,11 @@ int sigar_who_list_get_win32(sigar_t *sigar, #else #define sigar_wProductType wProductType #endif +#ifdef _M_X64 +#define SIGAR_ARCH "x64" +#else +#define SIGAR_ARCH "x86" +#endif int sigar_os_sys_info_get(sigar_t *sigar, sigar_sys_info_t *sysinfo) @@ -3413,8 +3418,8 @@ int sigar_os_sys_info_get(sigar_t *sigar, if (code_name) { SIGAR_SSTRCPY(sysinfo->vendor_code_name, code_name); } - /* XXX only arch we currently support */ - SIGAR_SSTRCPY(sysinfo->arch, "x86"); + + SIGAR_SSTRCPY(sysinfo->arch, SIGAR_ARCH); sprintf(sysinfo->version, "%d.%d", version.dwMajorVersion,