Move cord_pos.h to public headers folder (since included from cord.h)

* include/private/cord_pos.h: Rename to include/cord_pos.h.
* BCC_MAKEFILE (de_win.obj): Rename "private/cord_pos.h" entry to
"cord_pos.h".
* Makefile.direct (CORD_SRCS, CORD_INCLUDE_FILES): Likewise.
* Makefile.dj (CORD_SRCS, CORD_INCLUDE_FILES): Likewise.
* NT_MAKEFILE (de_win.obj): Likewise.
* NT_STATIC_THREADS_MAKEFILE (de_win.obj): Likewise.
* NT_X64_STATIC_THREADS_MAKEFILE (de_win.obj): Likewise.
* NT_X64_THREADS_MAKEFILE (de_win.obj): Likewise.
* OS2_MAKEFILE (cordbscs.obj, cordxtra.obj, cordprnt.obj,
cordtest.exe): Likewise.
* gc.mak (DEP_CPP_DE_WI, DEP_CPP_DE_C2e, DEP_CPP_CORDX,
DEP_CPP_CORDB): Likewise.
* include/include.am (dist_noinst_HEADERS): Likewise.
* include/cord.h: Include "private/cord_pos.h" instead of "cord_pos.h".
* include/cord_pos.h (CORD_H): Test (skip the file if undefined).
* include/cord_pos.h (CORD_POSITION_H): Define.

12 files changed, 22 insertions, 20 deletions

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index d0d08880..4e453346 100644
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -55,7 +55,7 @@ gctest.exe: tests\test.obj gc.lib
 |

 

 cord\tests\de.obj cord\tests\de_win.obj: include\cord.h \

-    include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h

+    include\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h

 

 cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj \

     cord\tests\de_win.obj cord\tests\de_win.res gc.lib

diff --git a/Makefile.direct b/Makefile.direct
index 10020fb9..9fe5e67b 100644
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -86,7 +86,7 @@ CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c \
 
 CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/tests/de.c \
   cord/tests/cordtest.c include/cord.h include/ec.h \
-  include/private/cord_pos.h cord/tests/de_win.c cord/tests/de_win.h \
+  include/cord_pos.h cord/tests/de_win.c cord/tests/de_win.h \
   cord/tests/de_cmds.h cord/tests/de_win.rc
 
 CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
@@ -148,7 +148,7 @@ OTHER_FILES= tools/setjmp_t.c tools/callprocs.sh extra/MacOS.c \
   $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
-  $(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h
+  $(srcdir)/include/ec.h $(srcdir)/include/cord_pos.h
 
 UTILS= if_mach if_not_there threadlibs
 
diff --git a/Makefile.dj b/Makefile.dj
index 430e80f2..b7658cca 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -43,7 +43,7 @@ CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c header
 
 CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/tests/de.c \
     cord/tests/cordtest.c include/cord.h include/ec.h \
-    include/private/cord_pos.h cord/tests/de_win.c cord/tests/de_win.h \
+    include/cord_pos.h cord/tests/de_win.c cord/tests/de_win.h \
     cord/tests/de_cmds.h cord/tests/de_win.rc
 
 CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
@@ -74,7 +74,7 @@ OTHER_FILES= PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
            Makefile.dj doc/README.alpha doc/README.linux WCC_MAKEFILE
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
-	$(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h
+	$(srcdir)/include/ec.h $(srcdir)/include/cord_pos.h
 
 UTILS= if_mach$(EXE_SUFFIX) if_not_there$(EXE_SUFFIX)
 
diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index 340766d3..3cf3be98 100644
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -37,7 +37,7 @@ gctest.exe: tests\test.obj gc.lib
 cord\de_win.rbj: cord\de_win.res
 	cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res
 
-cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
+cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
 
 cord\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h
 	$(rc) $(rcvars) -r -fo cord\de_win.res cord\tests\de_win.rc
diff --git a/NT_STATIC_THREADS_MAKEFILE b/NT_STATIC_THREADS_MAKEFILE
index 8bb375b2..8774eab1 100644
--- a/NT_STATIC_THREADS_MAKEFILE
+++ b/NT_STATIC_THREADS_MAKEFILE
@@ -44,7 +44,7 @@ gctest.exe: tests\test.obj gc.lib
 cord\de_win.rbj: cord\de_win.res
 	cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res
 
-cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
+cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
 
 cord\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h
 	$(rc) $(rcvars) -r -fo cord\de_win.res cord\tests\de_win.rc
diff --git a/NT_X64_STATIC_THREADS_MAKEFILE b/NT_X64_STATIC_THREADS_MAKEFILE
index 2574a621..3ccb75d4 100644
--- a/NT_X64_STATIC_THREADS_MAKEFILE
+++ b/NT_X64_STATIC_THREADS_MAKEFILE
@@ -43,7 +43,7 @@ gctest.exe: tests\test.obj gc.lib
 cord\de_win.rbj: cord\de_win.res
 	cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res
 
-cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
+cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
 
 cord\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h
 	$(rc) $(rcvars) -r -fo cord\de_win.res cord\tests\de_win.rc
diff --git a/NT_X64_THREADS_MAKEFILE b/NT_X64_THREADS_MAKEFILE
index 45c27d59..d56dd5b5 100644
--- a/NT_X64_THREADS_MAKEFILE
+++ b/NT_X64_THREADS_MAKEFILE
@@ -58,7 +58,7 @@ gctest.exe: tests\test.obj gc64_dll.lib
 cord\de_win.rbj: cord\de_win.res
 	cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res
 
-cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
+cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
 
 cord\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h
 	$(rc) $(rcvars) -r -fo cord\de_win.res cord\tests\de_win.rc
diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE
index d4cdd54d..acfcd566 100644
--- a/OS2_MAKEFILE
+++ b/OS2_MAKEFILE
@@ -32,14 +32,14 @@ mach_dep.obj: mach_dep.c
 gctest.exe: test.obj gc.lib
         $(CC) $(CFLAGS) /B"/STACK:524288" /Fegctest test.obj gc.lib
 
-cord\cordbscs.obj: cord\cordbscs.c include\cord.h include\private\cord_pos.h
+cord\cordbscs.obj: cord\cordbscs.c include\cord.h include\cord_pos.h
         $(CC) $(CFLAGS) /C /Focord\cordbscs cord\cordbscs.c
 
-cord\cordxtra.obj: cord\cordxtra.c include\cord.h include\private\cord_pos.h include\ec.h
+cord\cordxtra.obj: cord\cordxtra.c include\cord.h include\cord_pos.h include\ec.h
         $(CC) $(CFLAGS) /C /Focord\cordxtra cord\cordxtra.c
 
-cord\cordprnt.obj: cord\cordprnt.c include\cord.h include\private\cord_pos.h include\ec.h
+cord\cordprnt.obj: cord\cordprnt.c include\cord.h include\cord_pos.h include\ec.h
         $(CC) $(CFLAGS) /C /Focord\cordprnt cord\cordprnt.c
 
-cord\cordtest.exe: cord\tests\cordtest.c include\cord.h include\private\cord_pos.h include\ec.h $(CORDOBJS) gc.lib
+cord\cordtest.exe: cord\tests\cordtest.c include\cord.h include\cord_pos.h include\ec.h $(CORDOBJS) gc.lib
         $(CC) $(CFLAGS) /B"/STACK:65536" /Fecord\cordtest cord\tests\cordtest.c gc.lib $(CORDOBJS)
diff --git a/gc.mak b/gc.mak
index 50fe9037..9f92d381 100644
--- a/gc.mak
+++ b/gc.mak
@@ -2143,7 +2143,7 @@ DEP_CPP_DE_WI=\
 	".\include\cord.h"\
 	".\cord\tests\de_cmds.h"\
 	".\cord\tests\de_win.h"\
-	".\include\private\cord_pos.h"\
+	".\include\cord_pos.h"\
 
 NODEP_CPP_DE_WI=\
 	".\include\gc.h"\
@@ -2174,7 +2174,7 @@ DEP_CPP_DE_C2e=\
 	".\include\cord.h"\
 	".\cord\tests\de_cmds.h"\
 	".\cord\tests\de_win.h"\
-	".\include\private\cord_pos.h"\
+	".\include\cord_pos.h"\
 
 NODEP_CPP_DE_C2e=\
 	".\include\gc.h"\
@@ -2204,7 +2204,7 @@ SOURCE=.\cord\cordxtra.c
 DEP_CPP_CORDX=\
 	".\include\cord.h"\
 	".\include\ec.h"\
-	".\include\private\cord_pos.h"\
+	".\include\cord_pos.h"\
 
 NODEP_CPP_CORDX=\
 	".\include\gc.h"\
@@ -2233,7 +2233,7 @@ NODEP_CPP_CORDX=\
 SOURCE=.\cord\cordbscs.c
 DEP_CPP_CORDB=\
 	".\include\cord.h"\
-	".\include\private\cord_pos.h"\
+	".\include\cord_pos.h"\
 
 NODEP_CPP_CORDB=\
 	".\include\gc.h"\
diff --git a/include/cord.h b/include/cord.h
index 74b6c986..05eb4c4c 100644
--- a/include/cord.h
+++ b/include/cord.h
@@ -179,7 +179,7 @@ CORD_API int CORD_riter(CORD x, CORD_iter_fn f1, void * client_data);
 /* described below.  Also note that                                     */
 /* CORD_pos_fetch, CORD_next and CORD_prev have both macro and function */
 /* definitions.  The former may evaluate their argument more than once. */
-#include "private/cord_pos.h"
+#include "cord_pos.h"
 
 /*
         Visible definitions from above:
diff --git a/include/private/cord_pos.h b/include/cord_pos.h
index ce4be854..beaa2368 100644
--- a/include/private/cord_pos.h
+++ b/include/cord_pos.h
@@ -11,7 +11,9 @@
  * modified is included with the above copyright notice.
  */
 
-# ifndef CORD_POSITION_H
+/* This should never be included directly; included only from cord.h.   */
+#if !defined(CORD_POSITION_H) && defined(CORD_H)
+#define CORD_POSITION_H
 
 /* The representation of CORD_position.  This is private to the */
 /* implementation, but the size is known to clients.  Also      */
diff --git a/include/include.am b/include/include.am
index 815640a3..1b2a557b 100644
--- a/include/include.am
+++ b/include/include.am
@@ -33,9 +33,9 @@ pkginclude_HEADERS += \
 #
 dist_noinst_HEADERS += \
         include/cord.h \
+        include/cord_pos.h \
         include/ec.h \
         include/new_gc_alloc.h \
-        include/private/cord_pos.h \
         include/private/darwin_semaphore.h \
         include/private/darwin_stop_world.h \
         include/private/dbg_mlc.h \