Revert trunk to bleeding_edge at r12484

src/atomicops.h

Index: src/atomicops.h
diff --git a/src/atomicops.h b/src/atomicops.h
index 1f0c44a67d401e439a49c91fa13a80aa44f48b32..e2057ed0731d3bf4715a458cf6e0aece595620a7 100644
--- a/src/atomicops.h
+++ b/src/atomicops.h
@@ -69,11 +69,7 @@ typedef intptr_t Atomic64;
 
 // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
 // Atomic64 routines below, depending on your architecture.
-#if defined(__OpenBSD__) && defined(__i386__)
-typedef Atomic32 AtomicWord;
-#else
 typedef intptr_t AtomicWord;
-#endif
 
 // Atomically execute:
 //      result = *ptr;