diff options
| author | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-07 23:40:38 +0000 |
|---|---|---|
| committer | robert.nagy@gmail.com <robert.nagy@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-07 23:40:38 +0000 |
| commit | 779c3ffe0dc919a98a18d6b2c0098c92465aff2c (patch) | |
| tree | e2d9bf1684c02862add67080db584bf8bdbb3c1d /gpu | |
| parent | c460adba85bc177ce2d9da77df4c9b6f49f5a42d (diff) | |
| download | chromium_src-779c3ffe0dc919a98a18d6b2c0098c92465aff2c.zip chromium_src-779c3ffe0dc919a98a18d6b2c0098c92465aff2c.tar.gz chromium_src-779c3ffe0dc919a98a18d6b2c0098c92465aff2c.tar.bz2 | |
Sync with the NSPR headers on OpenBSD and use OS_* defines
since we have to include build_config.h anyways
BUG=
TEST=
Review URL: http://codereview.chromium.org/8342001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108940 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/common/types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/common/types.h b/gpu/command_buffer/common/types.h index 74e5103..718ecca 100644 --- a/gpu/command_buffer/common/types.h +++ b/gpu/command_buffer/common/types.h @@ -28,7 +28,7 @@ typedef int int32; // The NSPR system headers define 64-bit as |long| when possible. In order to // not have typedef mismatches, we do the same on LP64. -#if __LP64__ +#if defined(__LP64__) && !defined(__APPLE__) && !defined(__OpenBSD__) typedef long int64; #else typedef long long int64; @@ -53,7 +53,7 @@ typedef unsigned int uint32; #endif // See the comment above about NSPR and 64-bit. -#if __LP64__ +#if defined(__LP64__) && !defined(__APPLE__) && !defined(__OpenBSD__) typedef unsigned long uint64; #else typedef unsigned long long uint64; @@ -95,7 +95,7 @@ char (&ArraySizeHelper(T (&array)[N]))[N]; // That gcc wants both of these prototypes seems mysterious. VC, for // its part, can't decide which to use (another mystery). Matching of // template overloads: the final frontier. -#ifndef _MSC_VER +#if !defined(_MSC_VER) template <typename T, size_t N> char (&ArraySizeHelper(const T (&array)[N]))[N]; #endif |