From 5a2d51d07cc98da209b439eef45cf4add2b36542 Mon Sep 17 00:00:00 2001
From: ricroc <ricroc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Wed, 5 Nov 2003 18:31:49 +0000
Subject: [PATCH] My first attempt to synchronize OPTYap with CVS

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@918 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 console/yap.c |  7 +------
 m4/Yap.h.m4   | 23 ++++++-----------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/console/yap.c b/console/yap.c
index 148f5f35c..352c99617 100644
--- a/console/yap.c
+++ b/console/yap.c
@@ -495,17 +495,12 @@ main (int argc, char **argv)
   int BootMode;
   YAP_init_args init_args;
 
-#ifdef SIMICS
-  fprintf(stdout,"Entering YAP\n");
-#endif /* SIMICS */
   BootMode = init_standard_system(argc, argv, &init_args);
   if (BootMode == YAP_BOOT_FROM_SAVED_ERROR) {
     fprintf(stderr,"[ FATAL ERROR: could not find saved state ]\n");
     exit(1);
   }
-#if defined(YAPOR) || defined(TABLING)
-  start_workers();
-#endif /* YAPOR || TABLING */
+
   exec_top_level(BootMode, &init_args);
 
   return(0);
diff --git a/m4/Yap.h.m4 b/m4/Yap.h.m4
index d1de7943a..a11b8eb9f 100644
--- a/m4/Yap.h.m4
+++ b/m4/Yap.h.m4
@@ -10,7 +10,7 @@
 * File:		Yap.h.m4						 *
 * mods:									 *
 * comments:	main header file for YAP				 *
-* version:      $Id: Yap.h.m4,v 1.47 2003-06-06 11:54:02 vsc Exp $	 *
+* version:      $Id: Yap.h.m4,v 1.48 2003-11-05 18:31:49 ricroc Exp $	 *
 *************************************************************************/
 
 #include "config.h"
@@ -23,8 +23,6 @@
 
 #define COROUTINING 1
 
-#define YAPOR      1
-
 #define ANALYST 1
 
 */
@@ -33,7 +31,7 @@
 
 #if defined(TABLING)
 #error Do not explicitly define TABLING
-#endif /* YAPOR */
+#endif /* TABLING */
 
 #if defined(TABLING_BATCHED_SCHEDULING) && defined(TABLING_LOCAL_SCHEDULING)
 #error Do not define multiple tabling scheduling strategies
@@ -79,19 +77,9 @@
 #endif
 #endif
 
-#ifdef SBA
-#ifdef YAPOR
-#ifndef FROZEN_STACKS
+#if defined(TABLING) || defined(SBA)
 #define FROZEN_STACKS 1
-#endif
-#endif
-#endif
-
-#ifdef TABLING
-#ifndef FROZEN_STACKS
-#define FROZEN_STACKS 1
-#endif
-#endif
+#endif /* TABLING || SBA */
 
 #ifdef _MSC_VER /* Microsoft's Visual C++ Compiler */
 /* adjust a config.h from mingw32 to work with vc++ */
@@ -542,7 +530,7 @@ typedef enum {
 /* These must be included before unification handlers */
 #if defined(YAPOR) || defined(TABLING)
 #include "opt.config.h"
-#endif
+#endif /* YAPOR || TABLING */
 
 /***********************************************************************/
 
@@ -603,6 +591,7 @@ and  RefOfTerm(t) : Term -> DBRef = ...
 	incompatible with the high tag scheme. Linux-ELF also does not like
 	if you place things in the lower addresses (power to the libc people).
 */
+
 #if (defined(_AIX) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(_POWER) || defined(__linux__) || defined(IN_SECOND_QUADRANT)) && !defined(TABLING)
 #define USE_LOW32_TAGS 1
 #endif