[Vm-dev] [commit][3432] CogVM source as per VMMaker.oscog-eem.1448

[commits at squeakvm.org]

Revision: 3432
Author:   eliot
Date:     2015-09-10 16:20:00 -0700 (Thu, 10 Sep 2015)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.1448

Fix emit of PharoVM define in the FIlePlugin

Modified Paths:
--------------
    branches/Cog/src/plugins/FilePlugin/FilePlugin.c

Property Changed:
----------------
    branches/Cog/platforms/Cross/vm/sqSCCSVersion.h


Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
   - Tue Sep  1 12:12:00 PDT 2015
   + Thu Sep 10 16:19:32 PDT 2015

Modified: branches/Cog/src/plugins/FilePlugin/FilePlugin.c
===================================================================
--- branches/Cog/src/plugins/FilePlugin/FilePlugin.c	2015-09-10 21:02:28 UTC (rev 3431)
+++ branches/Cog/src/plugins/FilePlugin/FilePlugin.c	2015-09-10 23:20:00 UTC (rev 3432)
@@ -1,9 +1,9 @@
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b
+	VMPluginCodeGenerator VMMaker.oscog-eem.1448 uuid: 987a0908-6f37-437b-80a8-4db22a6e92bd
    from
-	FilePlugin VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b
+	FilePlugin VMMaker.oscog-eem.1448 uuid: 987a0908-6f37-437b-80a8-4db22a6e92bd
  */
-static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1417 uuid: 5220753e-35a2-46e9-89ad-f7e65d93073b " __DATE__ ;
+static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.1448 uuid: 987a0908-6f37-437b-80a8-4db22a6e92bd " __DATE__ ;
 
 
 
@@ -41,7 +41,9 @@
 #define COGMTVM 0
 #define DirBadPath 2
 #define DirNoMoreEntries 1
-#define PharoVM 0
+#if !defined(PharoVM) /* Allow PharoVM to be overridden on the compiler command line */
+# define PharoVM 0
+#endif
 #define PrimErrBadArgument 3
 #define PrimErrBadIndex 4
 #define PrimErrNoMemory 9
@@ -178,9 +180,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"FilePlugin VMMaker.oscog-eem.1417 (i)"
+	"FilePlugin VMMaker.oscog-eem.1448 (i)"
 #else
-	"FilePlugin VMMaker.oscog-eem.1417 (e)"
+	"FilePlugin VMMaker.oscog-eem.1448 (e)"
 #endif
 ;
 static void * sCCPfn;