From e528893b731decb576e3ef9c61cdf9653dde1369 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Thu, 22 Nov 2018 10:23:35 +0000
Subject: [PATCH] fixes to interface code

---
 H/CMakeLists.txt                       | 2 ++
 H/Yap.h                                | 2 +-
 cmake/Sources.cmake                    | 2 --
 include/VFS.h                          | 2 +-
 include/YapDefs.h                      | 2 +-
 os/encoding.h => include/YapEncoding.h | 0
 include/YapTerm.h                      | 2 +-
 os/CMakeLists.txt                      | 2 +-
 os/readutil.c                          | 2 +-
 swi/library/predicate_options.pl       | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename os/encoding.h => include/YapEncoding.h (100%)

diff --git a/H/CMakeLists.txt b/H/CMakeLists.txt
index be369505c..546484dea 100644
--- a/H/CMakeLists.txt
+++ b/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 )
diff --git a/H/Yap.h b/H/Yap.h
index ec1d39ba2..0fd88ef99 100755
--- a/H/Yap.h
+++ b/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
diff --git a/cmake/Sources.cmake b/cmake/Sources.cmake
index dcaea42c8..822c5e958 100644
--- a/cmake/Sources.cmake
+++ b/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
diff --git a/include/VFS.h b/include/VFS.h
index 624d5d6ce..ef30276e4 100644
--- a/include/VFS.h
+++ b/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 */
diff --git a/include/YapDefs.h b/include/YapDefs.h
index 58aa5a749..351139742 100755
--- a/include/YapDefs.h
+++ b/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;
 
diff --git a/os/encoding.h b/include/YapEncoding.h
similarity index 100%
rename from os/encoding.h
rename to include/YapEncoding.h
diff --git a/include/YapTerm.h b/include/YapTerm.h
index 3efc37a77..f67647556 100644
--- a/include/YapTerm.h
+++ b/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;
 
diff --git a/os/CMakeLists.txt b/os/CMakeLists.txt
index b3b12e1f2..03b8fba72 100644
--- a/os/CMakeLists.txt
+++ b/os/CMakeLists.txt
@@ -2,7 +2,7 @@ set (YAPOS_HEADERS
         getw.h
         iopreds.h
         yapio.h
-        encoding.h
+        YapEncoding.h
         )
 
 set (YAPOS_SOURCES
diff --git a/os/readutil.c b/os/readutil.c
index 4c5059d19..05762b4e1 100644
--- a/os/readutil.c
+++ b/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"
 
diff --git a/swi/library/predicate_options.pl b/swi/library/predicate_options.pl
index aa1b597e3..a1a8fe018 100644
--- a/swi/library/predicate_options.pl
+++ b/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 ^      :