From a1467f2140f9db3408f6214137c7dc31f10d0bd9 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 16 Jan 2012 09:24:57 +0400 Subject: 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. --- NT_MAKEFILE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'NT_MAKEFILE') 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 -- cgit v1.2.1