aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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"