Inp/Out changes, blobs

CXX/yapi.hh

@@ -38,8 +38,6 @@ extern "C" {
 
 #include "YapHeap.h"
 
-#include "pl-shared.h"
-
 #include "clause.h"
 
 #include "yapio.h"
@@ -48,8 +46,6 @@ extern "C" {
 
 #include "attvar.h"
 
-#include "SWI-Stream.h"
-
 #include "YapText.h"
 
 #if HAVE_STDARG_H
@@ -70,11 +66,20 @@ extern "C" {
 
 // taken from yap_structs.h
 #include "iopreds.h"
+    
+    extern void YAP_UserCPredicate(const char *, YAP_UserCPred, YAP_Arity arity);
+    
+    /*  void UserCPredicateWithArgs(const char *name, int *fn(), unsigned int arity) */
+    extern void YAP_UserCPredicateWithArgs(const char *, YAP_UserCPred, YAP_Arity, YAP_Term);
+    
+    /*  void UserBackCPredicate(const char *name, int *init(), int *cont(), int
+     arity, int extra) */
+    extern void YAP_UserBackCPredicate(const char *, YAP_UserCPred, YAP_UserCPred, YAP_Arity, unsigned int);
+    
+    extern Term Yap_StringToTerm(const char *s, size_t len, encoding_t enc, int prio, Term *bindings_p);
+
 
-  extern Term Yap_StringToTerm(const char *s, size_t len, term_t bindings);
 
-  // we cannot consult YapInterface.h, that conflicts with what we declare, though
-  // it shouldn't
 }