summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1998-01-27 21:16:28 +0000
committerlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1998-01-27 21:16:28 +0000
commitfc7a332783029bbbcb10e1230b8162850ab451c7 (patch)
tree9bca0b1d738fd02492a58c037cff4703d57a7289
parent1146f1792fe477843ab0726a5eb41234e9ddfa0d (diff)
downloadgcc-fc7a332783029bbbcb10e1230b8162850ab451c7.tar.gz
* fixincludes: Tweak fix for struct exception in math.h
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17513 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog4
-rwxr-xr-xgcc/fixincludes12
2 files changed, 12 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 41e441855fb..07b42ad7462 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 27 22:14:48 1998 Todd Vierling <tv@pobox.com>
+
+ * fixincludes: Tweak fix for struct exception in math.h
+
Tue Jan 27 17:21:09 1998 Gavin Koch (gavin@cygnus.com)
* mips/mips.c (mips_expand_prologue,mips_expand_epilogue):
diff --git a/gcc/fixincludes b/gcc/fixincludes
index 42d81b9161c..22d6c0e26a2 100755
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -2822,21 +2822,25 @@ if [ -r ${LIB}/$file ]; then
sed -e '/struct exception/i\
#ifdef __cplusplus\
#define exception __math_exception\
-#endif'\
+#endif
+'\
-e '/struct exception/a\
#ifdef __cplusplus\
#undef exception\
-#endif' ${LIB}/$file > ${LIB}/${file}.sed
+#endif
+' ${LIB}/$file > ${LIB}/${file}.sed
rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
if egrep 'matherr()' ${LIB}/$file >/dev/null 2>&1; then
sed -e '/matherr/i\
#ifdef __cplusplus\
#define exception __math_exception\
-#endif'\
+#endif
+'\
-e '/matherr/a\
#ifdef __cplusplus\
#undef exception\
-#endif' ${LIB}/$file > ${LIB}/${file}.sed
+#endif
+' ${LIB}/$file > ${LIB}/${file}.sed
rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
fi
if cmp $file ${LIB}/$file >/dev/null 2>&1; then