diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 15:43:00 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 15:43:00 +0000 |
| commit | 0281161c09660b9ea12337e6ea91d14a0a0c4e6d (patch) | |
| tree | 18a1b7ca965c034c7f19dde3af15021cc7826e92 /base/process_util_unittest_mac.h | |
| parent | d15012168dcf10d9a1493c902df4fd2215cb5cb3 (diff) | |
| download | chromium_src-0281161c09660b9ea12337e6ea91d14a0a0c4e6d.zip chromium_src-0281161c09660b9ea12337e6ea91d14a0a0c4e6d.tar.gz chromium_src-0281161c09660b9ea12337e6ea91d14a0a0c4e6d.tar.bz2 | |
64-bit support for Mac OS X in base_unittests.
BUG=44127, 18323
TEST=64-bit base_unittests should all pass
Review URL: http://codereview.chromium.org/2126001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_unittest_mac.h')
| -rw-r--r-- | base/process_util_unittest_mac.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/base/process_util_unittest_mac.h b/base/process_util_unittest_mac.h index 8402e85..7b4fe1c 100644 --- a/base/process_util_unittest_mac.h +++ b/base/process_util_unittest_mac.h @@ -14,13 +14,19 @@ namespace base { // Allocates memory via system allocators. Alas, they take a _signed_ size for // allocation. -void* AllocateViaCFAllocatorSystemDefault(int32 size); -void* AllocateViaCFAllocatorMalloc(int32 size); -void* AllocateViaCFAllocatorMallocZone(int32 size); +void* AllocateViaCFAllocatorSystemDefault(ssize_t size); +void* AllocateViaCFAllocatorMalloc(ssize_t size); +void* AllocateViaCFAllocatorMallocZone(ssize_t size); + +#if !defined(ARCH_CPU_64_BITS) +// See process_util_unittest_mac.mm for an explanation of why this function +// isn't implemented for the 64-bit environment. // Allocates a huge Objective C object. void* AllocatePsychoticallyBigObjCObject(); -} // namespace base +#endif // !ARCH_CPU_64_BITS + +} // namespace base #endif // BASE_PROCESS_UTIL_UNITTEST_MAC_H_ |