From 315a882e8feff4d7c4203558986a5ce1ccc7abfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Thu, 18 Jun 2015 08:09:31 +0100
Subject: [PATCH] remove swi deps

---
 C/c_interface.c | 4 +++-
 C/exec.c        | 1 -
 C/init.c        | 9 ++++-----
 C/modules.c     | 1 -
 C/parser.c      | 5 +----
 C/qlyr.c        | 1 -
 C/qlyw.c        | 1 -
 C/save.c        | 1 -
 C/scanner.c     | 1 -
 C/stdpreds.c    | 1 -
 C/text.c        | 1 -
 11 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/C/c_interface.c b/C/c_interface.c
index 763cdfe8c..6870a022c 100755
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -338,7 +338,9 @@
 #include "yapio.h"
 #include "Foreign.h"
 #include "attvar.h"
-#include "SWI-Stream.h"
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #if HAVE_STDARG_H
diff --git a/C/exec.c b/C/exec.c
index 674e6a4cb..25d5bbd31 100755
--- a/C/exec.c
+++ b/C/exec.c
@@ -19,7 +19,6 @@ static char     SccsId[] = "@(#)cdmgr.c	1.1 05/02/98";
 #endif
 
 #include "absmi.h"
-#include "pl-shared.h"
 #include "yapio.h"
 #include "attvar.h"
 #include "cut_c.h"
diff --git a/C/init.c b/C/init.c
index c521e274b..eed6dce9d 100755
--- a/C/init.c
+++ b/C/init.c
@@ -245,8 +245,7 @@ OpDec(int p, const char *type, Atom a, Term m)
     WRITE_UNLOCK(ae->ARWLock);
   }
   if (i <= 3) {
-    GET_LD
-    if (truePrologFlag(PLFLAG_ISO) &&
+    if (trueGlobalPrologFlag(ISO_FLAG) &&
 	info->Posfix != 0) /* there is a posfix operator */ {
       /* ISO dictates */
       WRITE_UNLOCK(info->OpRWLock);
@@ -255,8 +254,8 @@ OpDec(int p, const char *type, Atom a, Term m)
     }
     info->Infix = p;
   } else if (i <= 5) {
-    GET_LD
-    if (truePrologFlag(PLFLAG_ISO) &&
+
+    if (trueGlobalPrologFlag(ISO_FLAG) &&
 	info->Infix != 0) /* there is an infix operator */ {
       /* ISO dictates */
       WRITE_UNLOCK(info->OpRWLock);
@@ -1076,7 +1075,7 @@ InitLogDBErasedMarker(void)
 static void
 InitSWIAtoms(void)
 {
-  extern atom_t ATOM_;
+  /*  extern atom_t ATOM_;
 
   int j=0;
   MaxAtomTranslations = 2*N_SWI_ATOMS ;
diff --git a/C/modules.c b/C/modules.c
index 6e14e068a..a3912ad4c 100644
--- a/C/modules.c
+++ b/C/modules.c
@@ -21,7 +21,6 @@ static char SccsId[] = "%W% %G%";
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "pl-shared.h"
 
 static Int p_current_module(USES_REGS1);
 static Int p_current_module1(USES_REGS1);
diff --git a/C/parser.c b/C/parser.c
index 82ccefab5..340a66d00 100755
--- a/C/parser.c
+++ b/C/parser.c
@@ -142,10 +142,7 @@ dot with single quotes.
 #include "yapio.h"
 #include "eval.h"
 /* stuff we want to use in standard YAP code */
-#include "pl-shared.h"
-#include "YapText.h"
-#include "pl-read.h"
-#include "pl-text.h"
+#include "iopreds.h"
 #if HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/C/qlyr.c b/C/qlyr.c
index dc1d2f939..0929dfce1 100755
--- a/C/qlyr.c
+++ b/C/qlyr.c
@@ -17,7 +17,6 @@
 *************************************************************************/
 
 #include "absmi.h"
-#include <SWI-Stream.h>
 #include "Foreign.h"
 #include "alloc.h"
 #include "yapio.h"
diff --git a/C/qlyw.c b/C/qlyw.c
index e9238228b..f43f66da8 100755
--- a/C/qlyw.c
+++ b/C/qlyw.c
@@ -17,7 +17,6 @@
 *************************************************************************/
 
 #include "absmi.h"
-#include <SWI-Stream.h>
 #include "Foreign.h"
 #include "alloc.h"
 #include "yapio.h"
diff --git a/C/save.c b/C/save.c
index 78026dc4f..883c629e8 100755
--- a/C/save.c
+++ b/C/save.c
@@ -27,7 +27,6 @@ static char     SccsId[] = "@(#)save.c	1.3 3/15/90";
 #include <psapi.h>
 #endif
 #include "absmi.h"
-#include "SWI-Stream.h"
 #include "alloc.h"
 #if USE_DL_MALLOC
 #include "dlmalloc.h"
diff --git a/C/scanner.c b/C/scanner.c
index e3df05820..ab98f588b 100755
--- a/C/scanner.c
+++ b/C/scanner.c
@@ -406,7 +406,6 @@ writing, writing a BOM can be requested using the option
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "SWI-Stream.h"
 #include "yapio.h"
 #include "alloc.h"
 #include "eval.h"
diff --git a/C/stdpreds.c b/C/stdpreds.c
index c0c55fef6..24ad15576 100755
--- a/C/stdpreds.c
+++ b/C/stdpreds.c
@@ -285,7 +285,6 @@ static char SccsId[] = "%W% %G%";
 #include "YapHeap.h"
 #include "eval.h"
 #include "yapio.h"
-#include "pl-shared.h"
 #include "Foreign.h"
 #ifdef TABLING
 #include "tab.macros.h"
diff --git a/C/text.c b/C/text.c
index a8eaccd7d..d394f6235 100644
--- a/C/text.c
+++ b/C/text.c
@@ -20,7 +20,6 @@
 #include "YapHeap.h"
 #include "eval.h"
 #include "yapio.h"
-#include "pl-shared.h"
 #include "YapText.h"
 
 #include <string.h>