public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jon TURNEY <jturney@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Get rid of relative include paths in strace.cc
Date: Mon, 10 May 2021 15:59:46 +0000 (GMT) [thread overview]
Message-ID: <20210510155946.24599385040C@sourceware.org> (raw)
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"
reply other threads:[~2021-05-10 15:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210510155946.24599385040C@sourceware.org \
--to=jturney@sourceware.org \
--cc=cygwin-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).