* call.c (null_ptr_cst_p): Integer type, not integral type.

From-SVN: r15463

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 11b4885eea7feeb97416ca38e46e57f948b975a6..82cd0b6d1d9a18913a7a36ac4bcb96ba82b64bb8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 Mon Sep 15 11:52:13 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
+       * call.c (null_ptr_cst_p): Integer type, not integral type.
+
        * call.c (joust): Disable warnings until they can be moved to the
        right place.
 

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index c0152fbdf68ec308ded1e7efc95d601024af3967..af1f6af0be81c323abd7c3849fb50f720490f923 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -2999,7 +2999,7 @@ null_ptr_cst_p (t)
      tree t;
 {
   if (t == null_node
-      || integer_zerop (t) && INTEGRAL_TYPE_P (TREE_TYPE (t)))
+      || integer_zerop (t) && TREE_CODE (TREE_TYPE (t)) == INTEGER_TYPE)
     return 1;
   return 0;
 }