From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id B2FDF38618B8; Wed, 26 May 2021 09:04:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B2FDF38618B8 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: utils: enable -idirafter to fetch Cygwin headers from mingw sources X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 48a76190e84be92a6f55b0f6db1197633f243e90 X-Git-Newrev: fd84f6cf5107076cf881f0e0c62cc10b1e160e36 Message-Id: <20210526090437.B2FDF38618B8@sourceware.org> Date: Wed, 26 May 2021 09:04:37 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 09:04:37 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=fd84f6cf5107076cf881f0e0c62cc10b1e160e36 commit fd84f6cf5107076cf881f0e0c62cc10b1e160e36 Author: Corinna Vinschen Date: Wed May 26 10:59:03 2021 +0200 Cygwin: utils: enable -idirafter to fetch Cygwin headers from mingw sources Get rid of the last dreaded relative paths pointing to the cygwin dir. Signed-off-by: Corinna Vinschen Diff: --- winsup/utils/mingw/Makefile.am | 4 ++-- winsup/utils/mingw/cygcheck.cc | 6 +++--- winsup/utils/mingw/testsuite.h | 4 ++-- winsup/utils/path.cc | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am index 08a29828f..c06562d9b 100644 --- a/winsup/utils/mingw/Makefile.am +++ b/winsup/utils/mingw/Makefile.am @@ -29,7 +29,7 @@ cygcheck_SOURCES = \ cygcheck.cc \ dump_setup.cc \ path.cc -cygcheck_CPPFLAGS=-I$(srcdir)/.. +cygcheck_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/include cygcheck_LDADD = -lz -lwininet -lpsapi -lntdll cygwin_console_helper_SOURCES = cygwin-console-helper.cc @@ -47,7 +47,7 @@ noinst_PROGRAMS = path-testsuite path_testsuite_SOURCES = \ path.cc \ testsuite.cc -path_testsuite_CPPFLAGS=-I$(srcdir)/.. +path_testsuite_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/include path_testsuite_CXXFLAGS = -DTESTSUITE TESTS = path-testsuite diff --git a/winsup/utils/mingw/cygcheck.cc b/winsup/utils/mingw/cygcheck.cc index 61fb90ee3..d818a1907 100644 --- a/winsup/utils/mingw/cygcheck.cc +++ b/winsup/utils/mingw/cygcheck.cc @@ -20,10 +20,10 @@ #include "path.h" #include "wide_path.h" #include -#include "../cygwin/include/cygwin/version.h" -#include "../cygwin/include/sys/cygwin.h" +#include +#include #define _NOMNTENT_MACROS -#include "../cygwin/include/mntent.h" +#include #undef cygwin_internal #include "loadlib.h" diff --git a/winsup/utils/mingw/testsuite.h b/winsup/utils/mingw/testsuite.h index c3d9ad60d..bf2bce204 100644 --- a/winsup/utils/mingw/testsuite.h +++ b/winsup/utils/mingw/testsuite.h @@ -7,8 +7,8 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "path.h" -#include "../cygwin/include/cygwin/bits.h" -#include "../cygwin/include/sys/mount.h" +#include +#include /* This file implements a test harness for the MinGW implementation of POSIX path translation in utils/path.cc. This code is used by strace diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc index 1a412fc9d..b99467d9e 100644 --- a/winsup/utils/path.cc +++ b/winsup/utils/path.cc @@ -20,11 +20,11 @@ details. */ #include #include #include "path.h" -#include "../cygwin/include/cygwin/version.h" -#include "../cygwin/include/cygwin/bits.h" -#include "../cygwin/include/sys/mount.h" +#include +#include +#include #define _NOMNTENT_MACROS -#include "../cygwin/include/mntent.h" +#include #ifdef FSTAB_ONLY #include #endif