aboutsummaryrefslogtreecommitdiff
path: root/boehm-gc
diff options
context:
space:
mode:
authorLoren J. Rittle <ljrittle@acm.org>2003-07-29 02:38:49 +0000
committerLoren J. Rittle <ljrittle@gcc.gnu.org>2003-07-29 02:38:49 +0000
commit5fd5bdbd62322815065d88b6f54ac0704540d5d2 (patch)
treea3f1b612d41c552d04c26025e1838fb4f07d6e73 /boehm-gc
parent415d46362678d5b5ab71a96cec3363ad01870df5 (diff)
downloadgcc-5fd5bdbd62322815065d88b6f54ac0704540d5d2.zip
gcc-5fd5bdbd62322815065d88b6f54ac0704540d5d2.tar.gz
gcc-5fd5bdbd62322815065d88b6f54ac0704540d5d2.tar.bz2
* os_dep.c: Remove redundancy introduced in last merge.
From-SVN: r69912
Diffstat (limited to 'boehm-gc')
-rw-r--r--boehm-gc/ChangeLog4
-rw-r--r--boehm-gc/os_dep.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index afb1ce9..96e7f4b 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-28 Loren J. Rittle <ljrittle@acm.org>
+
+ * os_dep.c: Remove redundancy introduced in last merge.
+
2003-07-28 Jeff Sturm <jsturm@one-point.com>
Import GC 6.3alpha1.
diff --git a/boehm-gc/os_dep.c b/boehm-gc/os_dep.c
index fecda89..00950dd 100644
--- a/boehm-gc/os_dep.c
+++ b/boehm-gc/os_dep.c
@@ -91,10 +91,6 @@
# include <setjmp.h>
#endif
-#if defined(FREEBSD) && defined(I386)
-# include <machine/trap.h>
-#endif
-
#ifdef AMIGA
# define GC_AMIGA_DEF
# include "AmigaOS.c"