diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 19:26:05 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 19:26:05 +0000 |
| commit | 6e5e68de1f394c1ca53f4017f8bcb82d7cd8168c (patch) | |
| tree | 20e2bc5e399c1c0cf6a322322c5a03861b8febb8 /base/win/windows_version.h | |
| parent | 60d470a3b90a6b91123b31f5c3de0cfaa668b075 (diff) | |
| download | chromium_src-6e5e68de1f394c1ca53f4017f8bcb82d7cd8168c.zip chromium_src-6e5e68de1f394c1ca53f4017f8bcb82d7cd8168c.tar.gz chromium_src-6e5e68de1f394c1ca53f4017f8bcb82d7cd8168c.tar.bz2 | |
Move GetWindowsArchitecture() to windows_version.h.
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6624025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win/windows_version.h')
| -rw-r--r-- | base/win/windows_version.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/base/win/windows_version.h b/base/win/windows_version.h index bdd783d..df3cc35 100644 --- a/base/win/windows_version.h +++ b/base/win/windows_version.h @@ -30,6 +30,20 @@ Version GetVersion(); // Returns the major and minor version of the service pack installed. void GetServicePackLevel(int* major, int* minor); +enum WindowsArchitecture { + X86_ARCHITECTURE, + X64_ARCHITECTURE, + IA64_ARCHITECTURE, + OTHER_ARCHITECTURE, +}; + +// Returns the processor architecture this copy of Windows natively uses. +// For example, given an x64-capable processor, we have three possibilities: +// 32-bit Chrome running on 32-bit Windows: X86_ARCHITECTURE +// 32-bit Chrome running on 64-bit Windows via WOW64: X64_ARCHITECTURE +// 64-bit Chrome running on 64-bit Windows: X64_ARCHITECTURE +WindowsArchitecture GetWindowsArchitecture(); + enum WOW64Status { WOW64_DISABLED, WOW64_ENABLED, |