diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 17:59:29 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-01 17:59:29 +0000 |
| commit | ad14646aab259e8768ce706b2b30c443dab45410 (patch) | |
| tree | c508b8ef392fd5d6bcca83539353d4584b35cfce /base/third_party | |
| parent | a2534cf3c9ea5be36e6bda1eabf3fed23410ef31 (diff) | |
| download | chromium_src-ad14646aab259e8768ce706b2b30c443dab45410.zip chromium_src-ad14646aab259e8768ce706b2b30c443dab45410.tar.gz chromium_src-ad14646aab259e8768ce706b2b30c443dab45410.tar.bz2 | |
A better way to fix the compilation issues on Windows x64
with NSPR headers.
Test the Visual C++ predefined macros _M_X64 and _M_AMD64,
so that we don't need to include <windows.h> for the
definition of _AMD64_.
Remove obsolete code for Windows NT Alpha.
Based on upstream NSPR patch at
https://bugzilla.mozilla.org/show_bug.cgi?id=541690
R=maruel
BUG=none
TEST=No compilation errors on Windows.
Review URL: http://codereview.chromium.org/552182
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party')
| -rw-r--r-- | base/third_party/nspr/prcpucfg_win.h | 48 | ||||
| -rw-r--r-- | base/third_party/nspr/prtypes.h | 8 |
2 files changed, 2 insertions, 54 deletions
diff --git a/base/third_party/nspr/prcpucfg_win.h b/base/third_party/nspr/prcpucfg_win.h index 026258b..4ad5345 100644 --- a/base/third_party/nspr/prcpucfg_win.h +++ b/base/third_party/nspr/prcpucfg_win.h @@ -100,51 +100,7 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 2 -#elif defined(_ALPHA_) - -#define IS_LITTLE_ENDIAN 1 -#undef IS_BIG_ENDIAN - -#define PR_BYTES_PER_BYTE 1 -#define PR_BYTES_PER_SHORT 2 -#define PR_BYTES_PER_INT 4 -#define PR_BYTES_PER_INT64 8 -#define PR_BYTES_PER_LONG 4 -#define PR_BYTES_PER_FLOAT 4 -#define PR_BYTES_PER_DOUBLE 8 -#define PR_BYTES_PER_WORD 4 -#define PR_BYTES_PER_DWORD 8 - -#define PR_BITS_PER_BYTE 8 -#define PR_BITS_PER_SHORT 16 -#define PR_BITS_PER_INT 32 -#define PR_BITS_PER_INT64 64 -#define PR_BITS_PER_LONG 32 -#define PR_BITS_PER_FLOAT 32 -#define PR_BITS_PER_DOUBLE 64 -#define PR_BITS_PER_WORD 32 - -#define PR_BITS_PER_BYTE_LOG2 3 -#define PR_BITS_PER_SHORT_LOG2 4 -#define PR_BITS_PER_INT_LOG2 5 -#define PR_BITS_PER_INT64_LOG2 6 -#define PR_BITS_PER_LONG_LOG2 5 -#define PR_BITS_PER_FLOAT_LOG2 5 -#define PR_BITS_PER_DOUBLE_LOG2 6 -#define PR_BITS_PER_WORD_LOG2 5 - -#define PR_BYTES_PER_WORD_LOG2 2 -#define PR_BYTES_PER_DWORD_LOG2 3 - -#define PR_ALIGN_OF_SHORT 2 -#define PR_ALIGN_OF_INT 4 -#define PR_ALIGN_OF_LONG 4 -#define PR_ALIGN_OF_INT64 8 -#define PR_ALIGN_OF_FLOAT 4 -#define PR_ALIGN_OF_DOUBLE 8 -#define PR_ALIGN_OF_POINTER 4 - -#elif defined(_AMD64_) +#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN @@ -193,7 +149,7 @@ #define PR_BYTES_PER_WORD_LOG2 3 #define PR_BYTES_PER_DWORD_LOG2 3 -#elif defined(_IA64_) +#elif defined(_M_IA64) || defined(_IA64_) #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN diff --git a/base/third_party/nspr/prtypes.h b/base/third_party/nspr/prtypes.h index 39a9724..3453144 100644 --- a/base/third_party/nspr/prtypes.h +++ b/base/third_party/nspr/prtypes.h @@ -52,14 +52,6 @@ #ifndef prtypes_h___ #define prtypes_h___ -#include "build/build_config.h" - -#ifdef OS_WIN -// This files assumes windows.h has been included first since it expects _X86_ -// or _AMD64_ to be defined. -#include <windows.h> -#endif // OS_WIN - #ifdef MDCPUCFG #include MDCPUCFG #else |