From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jturney@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2201)
 id 24599385040C; Mon, 10 May 2021 15:59:46 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 24599385040C
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Jon TURNEY <jturney@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Get rid of relative include paths in strace.cc
X-Act-Checkin: newlib-cygwin
X-Git-Author: Jon Turney <jon.turney@dronecode.org.uk>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: b8bd9d1b012cb03861b74f128d97f42e0166a16e
X-Git-Newrev: 71e8b4500722aea251bf7ca8473186c72c56ca89
Message-Id: <20210510155946.24599385040C@sourceware.org>
Date: Mon, 10 May 2021 15:59:46 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2021 15:59:46 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=71e8b4500722aea251bf7ca8473186c72c56ca89

commit 71e8b4500722aea251bf7ca8473186c72c56ca89
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun May 9 16:03:49 2021 +0100

    Get rid of relative include paths in strace.cc

Diff:
---
 winsup/utils/mingw/Makefile.am |  2 +-
 winsup/utils/mingw/strace.cc   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am
index 73abc4264..874dce512 100644
--- a/winsup/utils/mingw/Makefile.am
+++ b/winsup/utils/mingw/Makefile.am
@@ -39,7 +39,7 @@ ldh_SOURCES = ldh.cc
 strace_SOURCES = \
 	path.cc \
 	strace.cc
-strace_CPPFLAGS=-I$(srcdir)/..
+strace_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin -idirafter ${top_srcdir}/cygwin/include
 strace_LDADD = -lntdll
 
 noinst_PROGRAMS = path-testsuite
diff --git a/winsup/utils/mingw/strace.cc b/winsup/utils/mingw/strace.cc
index a7797600c..d8a095fb6 100644
--- a/winsup/utils/mingw/strace.cc
+++ b/winsup/utils/mingw/strace.cc
@@ -21,11 +21,11 @@ details. */
 #include <time.h>
 #include <signal.h>
 #include <errno.h>
-#include "../../cygwin/include/sys/strace.h"
-#include "../../cygwin/include/sys/cygwin.h"
-#include "../../cygwin/include/cygwin/version.h"
-#include "../../cygwin/cygtls_padsize.h"
-#include "../../cygwin/gcc_seh.h"
+#include "sys/strace.h"
+#include "sys/cygwin.h"
+#include "cygwin/version.h"
+#include "cygtls_padsize.h"
+#include "gcc_seh.h"
 #include "path.h"
 #undef cygwin_internal
 #include "loadlib.h"