[Vm-dev] [commit] r2524 - Resolve problem introduced in earlier merge that breaks build for 64-bit object memory VM.

[commits at squeakvm.org]

Author: lewis
Date: 2012-01-08 06:35:24 -0800 (Sun, 08 Jan 2012)
New Revision: 2524

Modified:
   trunk/platforms/Cross/vm/sqVirtualMachine.h
Log:
Resolve problem introduced in earlier merge that breaks build for 64-bit object memory VM.

Do not include interp.h directly from sqVirtualMachine.h, and move the tests for VM_PROXY_MAJOR and VM_PROXY_MINOR after include sqMemoryAccess.h because the interp.h header is included from sqMemoryAccess.h, and interp.h defines the VM_PROXY_MAJOR and VM_PROXY_MINOR macros.


Modified: trunk/platforms/Cross/vm/sqVirtualMachine.h
===================================================================
--- trunk/platforms/Cross/vm/sqVirtualMachine.h	2012-01-06 21:09:07 UTC (rev 2523)
+++ trunk/platforms/Cross/vm/sqVirtualMachine.h	2012-01-08 14:35:24 UTC (rev 2524)
@@ -2,9 +2,9 @@
 #define _SqueakVM_H
 
 /* We expect interp.h to define VM_PROXY_MAJOR & VM_PROXY_MINOR appropriately
- * for the VM generated with it.
- */
-#include "interp.h"
+   for the VM generated with it.
+   sqMemoryAccess.h includes config.h followed by interp.h */
+#include "sqMemoryAccess.h"
 
 #ifndef VM_PROXY_MAJOR
 /* Increment the following number if you change the order of
@@ -17,8 +17,6 @@
 # define VM_PROXY_MINOR 12
 #endif
 
-#include "sqMemoryAccess.h"
-
 #if VM_PROXY_MINOR > 8
 # define PrimNoErr 0
 # define PrimErrGenericFailure 1