fixes to interface code

H/CMakeLists.txt

@@ -19,3 +19,5 @@ add_custom_command( OUTPUT ${CMAKE_TOP_BINARY_DIR}/dlocals.h
   DEPENDS locals.h )
 
 
+
+install(FILES ${INCLUDE_HEADERS} ${CORE_HEADERS} ${OPTYap_HEADERS} ${YAPOS_HEADERS} ${CONFIGURATION_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Yap )

H/Yap.h

@@ -776,7 +776,7 @@ extern struct worker_local Yap_local;
 #define REMOTE(wid) (&Yap_local)
 #endif
 
-#include "encoding.h"
+#include "YapEncoding.h"
 
 #include <stdio.h>
 #define YP_FILE FILE

cmake/Sources.cmake

@@ -253,8 +253,6 @@ set (OPTYap_HEADERS
   )
 
 set (YAPOS_HEADERS
-	${CMAKE_SOURCE_DIR}/os/encoding.h
-	${CMAKE_SOURCE_DIR}/os/fmemopen.h
 	${CMAKE_SOURCE_DIR}/os/format.h
 	${CMAKE_SOURCE_DIR}/os/getw.h
 	${CMAKE_SOURCE_DIR}/os/iopreds.h

include/VFS.h

@@ -31,7 +31,7 @@
 #endif
 #endif
 
-#include <encoding.h>
+#include <YapEncoding.h>
 
 typedef struct {
   dev_t st_dev;                     /* ID of device containing file */

include/YapDefs.h

@@ -69,7 +69,7 @@ typedef int (*YAP_agc_hook)(void *_Atom);
 
 #include "YapError.h"
 
-#include "../os/encoding.h"
+#include "YapEncoding.h"
 
 typedef encoding_t YAP_encoding_t;
 

include/YapTerm.h

@@ -116,7 +116,7 @@ typedef void *YAP_Functor;
 
 #include "YapError.h"
 
-#include "../os/encoding.h"
+#include "YapEncoding.h"
 
 typedef encoding_t YAP_encoding_t;
 

os/CMakeLists.txt

@@ -2,7 +2,7 @@ set (YAPOS_HEADERS
         getw.h
         iopreds.h
         yapio.h
-        encoding.h
+        YapEncoding.h
         )
 
 set (YAPOS_SOURCES

os/readutil.c

@@ -22,7 +22,7 @@ static char SccsId[] = "%W% %G%";
 #include "YapHeap.h"
 #include "YapText.h"
 #include "Yatom.h"
-#include "encoding.h"
+#include "YapEncoding.h"
 #include "iopreds.h"
 #include "yapio.h"
 

swi/library/predicate_options.pl

@@ -2811,7 +2811,7 @@ erroris
  
 supported:a
 781 ^ :
-#include "encoding.h"
+#include "YapEncoding.h"
 #includeIn file included from 
 
 /Users/vsc/github/yap-6.3/H/YapHandles.h ^      :