aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rwxr-xr-xgcc/fixinc/fixinc.svr410
2 files changed, 13 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 827b462..44a19e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-16 Jason Merrill <jason@casey.cygnus.com>
+
+ * fixinc/fixinc.svr4: Wrap byteorder.h with extern "C".
+
2000-02-16 Nick Clifton <nickc@cygnus.com>
* emit-rtl.c (emit_insn): Move RTL check into make_insn_raw.
diff --git a/gcc/fixinc/fixinc.svr4 b/gcc/fixinc/fixinc.svr4
index 342b146..bc2eab1 100755
--- a/gcc/fixinc/fixinc.svr4
+++ b/gcc/fixinc/fixinc.svr4
@@ -1,7 +1,7 @@
#! /bin/sh
# Install modified versions of certain ANSI-incompatible
# native System V Release 4 system include files.
-# Copyright (C) 1994, 1996, 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
# Contributed by Ron Guilmette (rfg@monkeys.com).
#
# This file is part of GNU CC.
@@ -1650,6 +1650,10 @@ cat <<'__EOF__' >${LIB}/sys/byteorder.h
#error You lose! This file is only useful with GNU compilers.
#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifndef __BYTE_ORDER__
/* Byte order defines. These are as defined on UnixWare 1.1, but with
double underscores added at the front and back. */
@@ -1774,6 +1778,10 @@ ntohs (unsigned int __arg)
return htons (__arg);
}
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
__EOF__
if [ -r ${INPUT}/sys/byteorder.h ]; then