Wrap assert.h in extern "C" { }

From-SVN: r7453

1 files changed, 30 insertions, 0 deletions

diff --git a/gcc/fixincludes b/gcc/fixincludes
index ab4a73c..3c7b1d1 100755
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -1398,6 +1398,8 @@ if [ -r ${LIB}/$file ]; then
       fi
     fi
   fi
+  rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+
   if cmp $file ${LIB}/$file >/dev/null 2>&1; then
     echo Deleting ${LIB}/$file\; no fixes were needed.
     rm -f ${LIB}/$file
@@ -1619,6 +1621,34 @@ struct exception;
   fi
 fi
 
+# assert.h on HP/UX is not C++ ready, even though NO_IMPLICIT_EXTERN_C
+# is defined on HP/UX.
+file=assert.h
+if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+  cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
+  chmod +w ${LIB}/$file 2>/dev/null
+  chmod a+r ${LIB}/$file 2>/dev/null
+fi
+
+if [ -r ${LIB}/$file ]; then
+  if egrep '"C"' ${LIB}/$file >/dev/null 2>/dev/null; then
+    true
+  else
+    echo Fixing $file
+    echo '#ifdef __cplusplus
+extern "C" {
+#endif' > ${LIB}/${file}.sed
+    cat ${LIB}/${file} >> ${LIB}/${file}.sed
+    echo '#ifdef __cplusplus
+}
+#endif' >> ${LIB}/${file}.sed 
+    rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+    if cmp $file ${LIB}/$file >/dev/null 2>&1; then
+      rm -f ${LIB}/$file
+    fi
+  fi
+fi
+
 # This file on SunOS 4 has a very large macro.  When the sed loop
 # tries pull it in, it overflows the pattern space size of the SunOS
 # sed (GNU sed does not have this problem).  Since the file does not