(NULL_PTR): Use the same definition as

	rtl.h and tree.h.

From-SVN: r1852

diff --git a/gcc/cccp.c b/gcc/cccp.c
index 79bb8169ba3540ba3c23cb58ef8900e3460719cb..a6b1250065c0598edffb1a1a01dc25f24931d0ed 100644 (file)
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -130,18 +130,24 @@ typedef struct { unsigned :16, :16, :16; } vms_ino_t;
 #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
 #endif
 
+/* Define a generic NULL if one hasn't already been defined.  */
+
 #ifndef NULL
 #define NULL 0
 #endif
 
-#ifndef NULL_PTR
-#ifdef __STDC__
-#define NULL_PTR (void *) NULL
+#ifndef GENERIC_PTR
+#if defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__)
+#define GENERIC_PTR void *
 #else
-#define NULL_PTR (char *) NULL
+#define GENERIC_PTR char *
 #endif
 #endif
 
+#ifndef NULL_PTR
+#define NULL_PTR ((GENERIC_PTR)0)
+#endif
+
 #ifndef INCLUDE_LEN_FUDGE
 #define INCLUDE_LEN_FUDGE 0
 #endif