diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 20:35:17 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 20:35:17 +0000 |
| commit | c9046afea46a4b8252392adced73f3d2a9fb354e (patch) | |
| tree | c557a80884a379eecf170e3cf88acee77bc4d837 /base/third_party/nspr | |
| parent | a4930c88e7fb14ba66340cbe393fcdf4c668e41c (diff) | |
| download | chromium_src-c9046afea46a4b8252392adced73f3d2a9fb354e.zip chromium_src-c9046afea46a4b8252392adced73f3d2a9fb354e.tar.gz chromium_src-c9046afea46a4b8252392adced73f3d2a9fb354e.tar.bz2 | |
Fix base::DIR_SOURCE_ROOT path calculation.
Add missing header files to base.vcproj.
Fix thread local storage implicit destructor call on Windows x64.
Fix build compilation issues in x64 with third party headers.
Fix Pickle for x64, the header doesn't need to be size_t, uint32 ought to be sufficient for the object.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/third_party/nspr')
| -rw-r--r-- | base/third_party/nspr/prtypes.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/base/third_party/nspr/prtypes.h b/base/third_party/nspr/prtypes.h index e9e41c2..d77a2a4 100644 --- a/base/third_party/nspr/prtypes.h +++ b/base/third_party/nspr/prtypes.h @@ -52,6 +52,14 @@ #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 |