From e6c898ee39f5e6520b7f596ba73b7487b4aa7011 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Wed, 20 Aug 2003 23:05:33 +0000 Subject: [PATCH] Temporarily go back to an absolute path for signal.h's #inclusion of trap.h so XFree86-4-clients will build. XFree86-4-clients uses -I- which really is really a bad idea as it screws up the valuable ability to #include headers using relative paths. Eventually we will have our own ports system that will cover these idiosyncratic gotchas. --- sys/cpu/i386/include/signal.h | 10 ++++++++-- sys/i386/include/signal.h | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/cpu/i386/include/signal.h b/sys/cpu/i386/include/signal.h index 44fb5769af..f21002b451 100644 --- a/sys/cpu/i386/include/signal.h +++ b/sys/cpu/i386/include/signal.h @@ -32,7 +32,7 @@ * * @(#)signal.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/signal.h,v 1.12 1999/11/12 13:52:11 marcel Exp $ - * $DragonFly: src/sys/cpu/i386/include/signal.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/signal.h,v 1.4 2003/08/20 23:05:33 dillon Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -46,7 +46,13 @@ typedef int sig_atomic_t; #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -#include "trap.h" /* codes for SIGILL, SIGFPE */ +/* + * XXX temporarily use a path instead of "bla.h" so the + * XFree86-4-clients port, which uses -I-, builds. Use of -I- should + * be banned, or the option should be fixed to not screw up relative-path + * includes. + */ +#include /* codes for SIGILL, SIGFPE */ /* * Information pushed on stack when a signal is delivered. diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h index 2a4fccb2b1..8c915c404b 100644 --- a/sys/i386/include/signal.h +++ b/sys/i386/include/signal.h @@ -32,7 +32,7 @@ * * @(#)signal.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/signal.h,v 1.12 1999/11/12 13:52:11 marcel Exp $ - * $DragonFly: src/sys/i386/include/Attic/signal.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/signal.h,v 1.4 2003/08/20 23:05:33 dillon Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -46,7 +46,13 @@ typedef int sig_atomic_t; #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -#include "trap.h" /* codes for SIGILL, SIGFPE */ +/* + * XXX temporarily use a path instead of "bla.h" so the + * XFree86-4-clients port, which uses -I-, builds. Use of -I- should + * be banned, or the option should be fixed to not screw up relative-path + * includes. + */ +#include /* codes for SIGILL, SIGFPE */ /* * Information pushed on stack when a signal is delivered. -- 2.41.0