From 3b22a5f93c43fe929725133f4ac4b79f9424c25c Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Wed, 21 Sep 2011 18:36:52 +0100 Subject: [PATCH] Bug 648735 - Fix build failure on OpenBSD/i386 & macppc; r=cjones ../../ipc/chromium/src/base/singleton.h:171: error: invalid conversion from 'base::subtle::AtomicWord*' to 'volatile base::subtle::Atomic32*' Lifted from www/chromium/patches/patch-base_atomicops_h --- ipc/chromium/src/base/atomicops.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ipc/chromium/src/base/atomicops.h b/ipc/chromium/src/base/atomicops.h index c78873c4b68f..feca142d3315 100644 --- a/ipc/chromium/src/base/atomicops.h +++ b/ipc/chromium/src/base/atomicops.h @@ -45,7 +45,11 @@ typedef int64 Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. +#if defined(OS_OPENBSD) && !defined(ARCH_CPU_64_BITS) +typedef Atomic32 AtomicWord; +#else typedef intptr_t AtomicWord; +#endif // Atomically execute: // result = *ptr;