merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index fee7f8901eba48dadb02abf397e3820f20563a2d..69793df7c6be540595b0eab87886942eabe445cb 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * ansidecl.h (NULL_PTR): Delete.
+
 2001-05-11  Jakub Jelinek  <jakub@redhat.com>
 
        * elf/ia64.h (ELF_STRING_ia64_unwind_once): Define.

diff --git a/include/ansidecl.h b/include/ansidecl.h
index 88187be678685da6e175cd0b9bf2007ed7e5ee05..4ef6db80b75bf43245a9f658d02e1aff3bbedd92 100644 (file)
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -161,16 +161,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #endif /* ANSI C.  */
 
-/* This is for GCC, which has historically used typed null pointer
-   constants.  It needs to be here so it is seen by headers included
-   by gcc's config.h.
-
-   FIXME: GCC probably doesn't need to use typed nulls anymore.
-   Clean it up, then remove this.  Ware variable-argument functions.  */
-#ifdef IN_GCC
-# define NULL_PTR ((PTR) 0)
-#endif
-
 /* Using MACRO(x,y) in cpp #if conditionals does not work with some
    older preprocessors.  Thus we can't define something like this: