*** empty log message ***

From-SVN: r614

diff --git a/gcc/fixinc.svr4 b/gcc/fixinc.svr4
index 8ba925dfdf7a139264b543ec990629f855f837bd..b943302dd151c740b1972fdf6406ea385bc71ed8 100755 (executable)
--- a/gcc/fixinc.svr4
+++ b/gcc/fixinc.svr4
@@ -319,6 +319,47 @@ EOF
   rm -f /tmp/$base
 fi
 
+# Likewise fix the definition of NULL in <dbm.h> so that it is conditional
+# and so that it is correct for both C and C++.
+
+file=dbm.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  ex /tmp/$base <<EOF
+  /^#define[   ]*NULL[         ]*((char \*) 0)$/c
+#ifndef NULL
+#ifdef __cplusplus
+#define __NULL_TYPE
+#else /* !defined(__cplusplus) */
+#define __NULL_TYPE (void *)
+#endif /* !defined(__cplusplus) */
+#define NULL (__NULL_TYPE 0)
+#endif /* !defined(NULL) */
+.
+  wq
+EOF
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    echo No change needed in $file_to_fix
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
 # Add some missing declarations to <sys/mman.h>.
 
 file=sys/mman.h