Push version 1.2.3 to trunk.

Fixed bug in reporting of out-of-memory situations.

Introduced hidden prototypes on certain builtin prototype objects such as String.prototype to emulate JSC's behavior of restoring the original function when deleting functions from those prototype objects.

Fixed crash bug in the register allocator.




git-svn-id: http://v8.googlecode.com/svn/trunk@1909 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/frames-inl.h b/src/frames-inl.h
index 8244c67..bf46f6b 100644
--- a/src/frames-inl.h
+++ b/src/frames-inl.h
@@ -29,19 +29,15 @@
 #define V8_FRAMES_INL_H_
 
 #include "frames.h"
-#ifdef V8_ARCH_ARM
+
+#if V8_TARGET_ARCH_IA32
+#include "ia32/frames-ia32.h"
+#elif V8_TARGET_ARCH_X64
+#include "x64/frames-x64.h"
+#elif V8_TARGET_ARCH_ARM
 #include "arm/frames-arm.h"
 #endif
 
-#ifdef V8_ARCH_X64
-#include "x64/frames-x64.h"
-#endif
-
-#ifdef V8_ARCH_IA32
-#include "ia32/frames-ia32.h"
-#endif
-
-
 namespace v8 { namespace internal {