summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2007-01-24 15:59:32 +0000
committerBenoit Foucher <benoit@zeroc.com>2007-01-24 15:59:32 +0000
commitd5d1402437364853b3e88205f2d95d5cd1881cc3 (patch)
treeb3d5fe8d28feea62eac16adf88234494a944e525 /cpp/src
parentFixed bug 1696 (diff)
downloadice-d5d1402437364853b3e88205f2d95d5cd1881cc3.tar.bz2
ice-d5d1402437364853b3e88205f2d95d5cd1881cc3.tar.xz
ice-d5d1402437364853b3e88205f2d95d5cd1881cc3.zip
Fixed Windows processor architecture
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/PlatformInfo.cpp21
1 files changed, 20 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index d2b2e813997..67bc0a95db5 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.cpp
@@ -188,7 +188,26 @@ PlatformInfo::PlatformInfo(const string& prefix,
os << osInfo.dwMajorVersion << "." << osInfo.dwMinorVersion;
_release = os.str();
_version = osInfo.szCSDVersion;
- _machine = "x86"; // TODO?
+
+ switch(sysInfo.wProcessorArchitecture)
+ {
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+ case 9: // PROCESSOR_ARCHITECTURE_AMD64
+#else
+ case PROCESSOR_ARCHITECTURE_AMD64:
+#endif
+ _machine = "x64";
+ break;
+ case PROCESSOR_ARCHITECTURE_IA64:
+ _machine = "IA64";
+ break;
+ case PROCESSOR_ARCHITECTURE_INTEL:
+ _machine = "x86";
+ break;
+ default:
+ _machine = "unknown";
+ break;
+ };
#else
struct utsname utsinfo;
uname(&utsinfo);