Smalltalk › Squeak › Squeak VM

[commit] r2438 - Eliminate enable fix-and-continue compilation flags from Mac builds.

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
commits-3
Reply | Threaded
Open this post in threaded view
♦
♦
|

[commit] r2438 - Eliminate enable fix-and-continue compilation flags from Mac builds.

commits-3
 
Author: eliot
Date: 2011-07-01 10:22:41 -0700 (Fri, 01 Jul 2011)
New Revision: 2438

Modified:
   branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
   branches/Cog/macbuild/BochsIA32Plugin/makeit
   branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj
   branches/Cog/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
   branches/Cog/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
   branches/Cog/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
   branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
   branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj
   branches/Cog/macbuild/makeclean
   branches/Cog/nsbuild/macbuild/CoreVM.xcodeproj/project.pbxproj
   branches/Cog/platforms/Cross/vm/sqVirtualMachine.c
   branches/Cog/platforms/Mac OS/plugins/LocalePlugin/SqueakLocale.pbproj/project.pbxproj
   branches/Cog/platforms/Mac OS/plugins/QuicktimePlugin/SqueakQuicktime.xcodeproj/project.pbxproj
   branches/Cog/platforms/Mac OS/plugins/ServicesPlugin/SqueakServices.pbproj/project.pbxproj
   branches/Cog/platforms/Mac OS/plugins/SpellingPlugin/SpellCheck/SpellCheck.pbproj/project.pbxproj
   branches/Cog/platforms/Mac OS/plugins/SpellingPlugin/SqueakSpelling.pbproj/project.pbxproj
   branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
   branches/Cog/platforms/unix/vm/sqUnixMain.c
   branches/Cog/platforms/win32/vm/sqWin32Intel.c
Log:
Eliminate enable fix-and-continue compilation flags from Mac builds.
Fix declaration of setInterruptCheckChain in sqVirtualMachine.c.
Rewrite complex ifdef ((STACKVM || NewspeakVM) && !COGVM) to be understandable.


Modified: branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -168,7 +168,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_OPTIMIZATION_LEVEL = 0;
  GCC_PRECOMPILE_PREFIX_HEADER = NO;
  INFOPLIST_FILE = Info.plist;

Modified: branches/Cog/macbuild/BochsIA32Plugin/makeit
===================================================================
--- branches/Cog/macbuild/BochsIA32Plugin/makeit 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/BochsIA32Plugin/makeit 2011-07-01 17:22:41 UTC (rev 2438)
@@ -9,7 +9,7 @@
  cp -R build/Debug/BochsIA32Plugin.bundle "../$d/Contents/Resources"
  fi
 done
-for d in Fast.app Teleplace.app
+for d in Fast.app Croquet.app
 do
  if [ -d "../$d" ]; then
  echo installed Release BochsIA32Plugin in ../$d

Modified: branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -2038,7 +2038,7 @@
  COPY_PHASE_STRIP = NO;
  DEBUGGING_SYMBOLS = YES;
  GCC_DYNAMIC_NO_PIC = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
  GCC_INPUT_FILETYPE = automatic;
  GCC_OPTIMIZATION_LEVEL = 0;

Modified: branches/Cog/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -194,7 +194,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_MODEL_TUNING = G5;
  GCC_OPTIMIZATION_LEVEL = 0;
  GCC_PRECOMPILE_PREFIX_HEADER = YES;

Modified: branches/Cog/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -171,7 +171,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_MODEL_TUNING = G5;
  GCC_OPTIMIZATION_LEVEL = 0;
  GCC_PRECOMPILE_PREFIX_HEADER = YES;

Modified: branches/Cog/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -351,7 +351,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_MODEL_TUNING = G5;
  GCC_OPTIMIZATION_LEVEL = 0;
  GCC_PRECOMPILE_PREFIX_HEADER = YES;

Modified: branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -421,7 +421,7 @@
  949199E709818612000FC37A /* Default */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_PRECOMPILE_PREFIX_HEADER = NO;
  GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
  INFOPLIST_FILE = "Mpeg3Plugin-Info.plist";

Modified: branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/Template/Template.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -148,7 +148,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_MODEL_TUNING = G5;
  GCC_OPTIMIZATION_LEVEL = 0;
  GCC_PRECOMPILE_PREFIX_HEADER = YES;

Modified: branches/Cog/macbuild/makeclean
===================================================================
--- branches/Cog/macbuild/makeclean 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/macbuild/makeclean 2011-07-01 17:22:41 UTC (rev 2438)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rm -r ./build ./*/build ./plugin-projects/*/build ./Teleplace.app
+rm -r ./build ./*/build ./plugin-projects/*/build ./Fast.app ./Debug.app ./Assert.app ./Croquet.app

Modified: branches/Cog/nsbuild/macbuild/CoreVM.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/nsbuild/macbuild/CoreVM.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/nsbuild/macbuild/CoreVM.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -67,8 +67,6 @@
  73BEE4CB137A1895009EA37A /* FloatArrayPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BEE4CA137A1895009EA37A /* FloatArrayPlugin.c */; };
  73BEE4CE137A191B009EA37A /* FloatMathPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BEE4CD137A191B009EA37A /* FloatMathPlugin.h */; };
  73BEE4D2137A19A3009EA37A /* sqaio.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BEE4CF137A19A3009EA37A /* sqaio.h */; };
- 73BEE4D3137A19A3009EA37A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BEE4D0137A19A3009EA37A /* sqGnu.h */; };
- 73BEE4D4137A19A3009EA37A /* sqPlatformSpecific.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BEE4D1137A19A3009EA37A /* sqPlatformSpecific.h */; };
  73DCBD131378A59F000E8F88 /* sqMacHostWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DCBD121378A59F000E8F88 /* sqMacHostWindow.h */; };
  73DCBD161378A687000E8F88 /* HostWindowPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 73DCBD151378A687000E8F88 /* HostWindowPlugin.h */; };
  73E7120F137A1DD7002EDF89 /* FileCopyPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 73E7120E137A1DD7002EDF89 /* FileCopyPlugin.h */; };
@@ -328,8 +326,6 @@
  73BEE4CA137A1895009EA37A /* FloatArrayPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = FloatArrayPlugin.c; path = plugins/FloatArrayPlugin/FloatArrayPlugin.c; sourceTree = "<group>"; };
  73BEE4CD137A191B009EA37A /* FloatMathPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FloatMathPlugin.h; path = FloatMathPlugin/FloatMathPlugin.h; sourceTree = "<group>"; };
  73BEE4CF137A19A3009EA37A /* sqaio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqaio.h; path = vm/sqaio.h; sourceTree = "<group>"; };
- 73BEE4D0137A19A3009EA37A /* sqGnu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqGnu.h; path = vm/sqGnu.h; sourceTree = "<group>"; };
- 73BEE4D1137A19A3009EA37A /* sqPlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqPlatformSpecific.h; path = vm/sqPlatformSpecific.h; sourceTree = "<group>"; };
  73DCBD121378A59F000E8F88 /* sqMacHostWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqMacHostWindow.h; path = HostWindowPlugin/sqMacHostWindow.h; sourceTree = "<group>"; };
  73DCBD151378A687000E8F88 /* HostWindowPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HostWindowPlugin.h; path = HostWindowPlugin/HostWindowPlugin.h; sourceTree = "<group>"; };
  73E7120E137A1DD7002EDF89 /* FileCopyPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileCopyPlugin.h; path = FileCopyPlugin/FileCopyPlugin.h; sourceTree = "<group>"; };
@@ -567,8 +563,6 @@
  isa = PBXGroup;
  children = (
  73BEE4CF137A19A3009EA37A /* sqaio.h */,
- 73BEE4D0137A19A3009EA37A /* sqGnu.h */,
- 73BEE4D1137A19A3009EA37A /* sqPlatformSpecific.h */,
  7351A09A100963670035A878 /* sqUnixThreads.c */,
  73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */,
  );
@@ -1431,8 +1425,6 @@
  734815401379F53100FD8ABB /* sqMacNSPluginUILogic2.h in Headers */,
  73BEE4CE137A191B009EA37A /* FloatMathPlugin.h in Headers */,
  73BEE4D2137A19A3009EA37A /* sqaio.h in Headers */,
- 73BEE4D3137A19A3009EA37A /* sqGnu.h in Headers */,
- 73BEE4D4137A19A3009EA37A /* sqPlatformSpecific.h in Headers */,
  7339708E137A1CE2001B0C43 /* fdlibm.h in Headers */,
  73E7120F137A1DD7002EDF89 /* FileCopyPlugin.h in Headers */,
  736BD0DA137B39A9001E6189 /* vmCallback.h in Headers */,

Modified: branches/Cog/platforms/Cross/vm/sqVirtualMachine.c
===================================================================
--- branches/Cog/platforms/Cross/vm/sqVirtualMachine.c 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/Cross/vm/sqVirtualMachine.c 2011-07-01 17:22:41 UTC (rev 2438)
@@ -227,7 +227,7 @@
 #endif
 
 #if STACKVM
-void (*setInterruptCheckChain(void (*aFunction)(void)))();
+extern void (*setInterruptCheckChain(void (*aFunction)(void)))();
 #else
 void (*setInterruptCheckChain(void (*aFunction)(void)))() { return 0; }
 #endif

Modified: branches/Cog/platforms/Mac OS/plugins/LocalePlugin/SqueakLocale.pbproj/project.pbxproj
===================================================================
--- branches/Cog/platforms/Mac OS/plugins/LocalePlugin/SqueakLocale.pbproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/Mac OS/plugins/LocalePlugin/SqueakLocale.pbproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -138,7 +138,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
  GCC_OPTIMIZATION_LEVEL = 0;
  OPTIMIZATION_CFLAGS = "-O0";

Modified: branches/Cog/platforms/Mac OS/plugins/QuicktimePlugin/SqueakQuicktime.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/platforms/Mac OS/plugins/QuicktimePlugin/SqueakQuicktime.xcodeproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/Mac OS/plugins/QuicktimePlugin/SqueakQuicktime.xcodeproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -42,7 +42,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
  GCC_OPTIMIZATION_LEVEL = 0;
  OPTIMIZATION_CFLAGS = "-O0";
@@ -303,7 +303,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
  GCC_OPTIMIZATION_LEVEL = 0;
  HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;

Modified: branches/Cog/platforms/Mac OS/plugins/ServicesPlugin/SqueakServices.pbproj/project.pbxproj
===================================================================
--- branches/Cog/platforms/Mac OS/plugins/ServicesPlugin/SqueakServices.pbproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/Mac OS/plugins/ServicesPlugin/SqueakServices.pbproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -121,7 +121,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
  GCC_OPTIMIZATION_LEVEL = 0;
  OPTIMIZATION_CFLAGS = "-O0";

Modified: branches/Cog/platforms/Mac OS/plugins/SpellingPlugin/SpellCheck/SpellCheck.pbproj/project.pbxproj
===================================================================
--- branches/Cog/platforms/Mac OS/plugins/SpellingPlugin/SpellCheck/SpellCheck.pbproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/Mac OS/plugins/SpellingPlugin/SpellCheck/SpellCheck.pbproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -16,7 +16,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
  GCC_OPTIMIZATION_LEVEL = 0;
  OPTIMIZATION_CFLAGS = "-O0";

Modified: branches/Cog/platforms/Mac OS/plugins/SpellingPlugin/SqueakSpelling.pbproj/project.pbxproj
===================================================================
--- branches/Cog/platforms/Mac OS/plugins/SpellingPlugin/SqueakSpelling.pbproj/project.pbxproj 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/Mac OS/plugins/SpellingPlugin/SqueakSpelling.pbproj/project.pbxproj 2011-07-01 17:22:41 UTC (rev 2438)
@@ -121,7 +121,7 @@
  buildSettings = {
  COPY_PHASE_STRIP = NO;
  GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
  GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
  GCC_OPTIMIZATION_LEVEL = 0;
  OPTIMIZATION_CFLAGS = "-O0";

Modified: branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c
===================================================================
--- branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c 2011-07-01 17:22:41 UTC (rev 2438)
@@ -155,7 +155,7 @@
   else if (!strncmp(argv[0], "-psn_", 5)) { return 1; }
   else if (!strcmp(argv[0], "-headless")) { gSqueakHeadless = true; return 1; }
   else if (!strcmp(argv[0], "-headfull")) { gSqueakHeadless = false; return 1; }
-#if STACKVM && !COGVM || NewspeakVM
+#if (STACKVM || NewspeakVM) && !COGVM
   else if (!strcmp(argv[0], "-sendtrace")) { extern sqInt sendTrace; sendTrace = 1; return 1; }
 #endif
   else if (argc > 1) {

Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-07-01 17:22:41 UTC (rev 2438)
@@ -1268,7 +1268,7 @@
       else if (!strcmp(argv[0], "-plugins")) { squeakPlugins= strdup(argv[1]); return 2; }
       else if (!strcmp(argv[0], "-encoding")) { setEncoding(&sqTextEncoding, argv[1]); return 2; }
       else if (!strcmp(argv[0], "-pathenc")) { setEncoding(&uxPathEncoding, argv[1]); return 2; }
-#if STACKVM && !COGVM || NewspeakVM
+#if (STACKVM || NewspeakVM) && !COGVM
   else if (!strcmp(argv[0], "-sendtrace")) { extern sqInt sendTrace; sendTrace = 1; return 1; }
 #endif
 #if STACKVM || NewspeakVM

Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c
===================================================================
--- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2011-06-19 22:44:12 UTC (rev 2437)
+++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2011-07-01 17:22:41 UTC (rev 2438)
@@ -1162,7 +1162,7 @@
 /****************************************************************************/
 /*                        sqMain                                            */
 /****************************************************************************/
-#if STACKVM && !COGVM || NewspeakVM
+#if (STACKVM || NewspeakVM) && !COGVM
 extern sqInt sendTrace;
 #endif
 #if STACKVM || NewspeakVM
@@ -1193,7 +1193,7 @@
   { ARG_FLAG, &fLowRights, "-lowRights" }, /* started with low rights,
  use alternate untrustedUserDirectory */
 #endif /* VISTA_SECURITY */
-#if STACKVM && !COGVM || NewspeakVM
+#if (STACKVM || NewspeakVM) && !COGVM
   { ARG_FLAG, &sendTrace, "-sendtrace"},
 #endif
 #if STACKVM || NewspeakVM

Free forum by Nabble Edit this page