Merged in earlier cccp.c changes.

From-SVN: r9217

diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index e552989087c1ffd96cbf3da53f52007822623d81..982bcc334491373068fbb4b38b76fb18f5a50d16 100644 (file)
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -34,7 +34,7 @@ extern int errno;
 #ifndef VMS
 #ifndef HAVE_STRERROR
 extern int sys_nerr;
-#if defined(bsd4_4) || defined(__NetBSD__)
+#if defined(bsd4_4)
 extern const char *const sys_errlist[];
 #else
 extern char *sys_errlist[];

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index 11fdfdd95ebde0b08ce3ee94d2b2902b2621462e..80a926989da653bef0d8864005ee802a9ceb9641 100644 (file)
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -119,12 +119,24 @@ static long right_shift ();
 #define HAVE_VALUE 4
 /*#define UNSIGNEDP 8*/
 
+#ifndef HOST_BITS_PER_WIDE_INT
+
+#if HOST_BITS_PER_LONG > HOST_BITS_PER_INT
+#define HOST_BITS_PER_WIDE_INT HOST_BITS_PER_LONG
+#define HOST_WIDE_INT long
+#else
+#define HOST_BITS_PER_WIDE_INT HOST_BITS_PER_INT
+#define HOST_WIDE_INT int
+#endif
+
+#endif
+
 struct operation {
     short op;
     char rprio; /* Priority of op (relative to it right operand). */
     char flags;
     char unsignedp;    /* true if value should be treated as unsigned */
-    long value;        /* The value logically "right" of op. */
+    HOST_WIDE_INT value;        /* The value logically "right" of op. */
 };
 \f
 /* Take care of parsing a number (anything that starts with a digit).
@@ -641,7 +653,7 @@ right_shift (pfile, a, unsignedp, b)
 /* Parse and evaluate a C expression, reading from PFILE.
    Returns the value of the expression.  */
 
-long
+HOST_WIDE_INT
 cpp_parse_expr (pfile)
      cpp_reader *pfile;
 {