[PATCH 3/2] Get rid of relative include paths in strace.cc
Corinna Vinschen
corinna-cygwin@cygwin.com
Mon May 10 08:09:07 GMT 2021
On May 9 16:09, Jon Turney wrote:
> ---
> 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"
> --
> 2.31.1
Great, please push.
Thanks,
Corinna
More information about the Cygwin-patches
mailing list