Changes to m4/src/Attic/builtin.c,v [branch-1_4]

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch-1_4
Changes by:     Eric Blake <ericb>      07/01/06 19:56:11

Index: src/builtin.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/builtin.c,v
retrieving revision 1.1.1.1.2.52
retrieving revision 1.1.1.1.2.53
diff -u -b -r1.1.1.1.2.52 -r1.1.1.1.2.53
--- src/builtin.c       11 Nov 2006 16:26:58 -0000      1.1.1.1.2.52
+++ src/builtin.c       6 Jan 2007 19:56:11 -0000       1.1.1.1.2.53
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2000, 2004, 2006
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2000, 2004, 2006, 2007
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -359,10 +359,10 @@
 static char const digits[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 static const char *
-ntoa (eval_t value, int radix)
+ntoa (int32_t value, int radix)
 {
   bool negative;
-  unsigned_eval_t uvalue;
+  uint32_t uvalue;
   static char str[256];
   char *s = &str[sizeof str];
 
@@ -371,12 +371,12 @@
   if (value < 0)
     {
       negative = true;
-      uvalue = (unsigned_eval_t) -value;
+      uvalue = -(uint32_t) value;
     }
   else
     {
       negative = false;
-      uvalue = (unsigned_eval_t) value;
+      uvalue = (uint32_t) value;
     }
 
   do
@@ -401,7 +401,7 @@
 {
   const char *s;
 
-  s = ntoa ((eval_t) val, 10);
+  s = ntoa ((int32_t) val, 10);
   obstack_grow (obs, s, strlen (s));
 }
 
@@ -940,7 +940,7 @@
 static void
 m4_eval (struct obstack *obs, int argc, token_data **argv)
 {
-  eval_t value = 0;
+  int32_t value = 0;
   int radix = 10;
   int min = 1;
   const char *s;
@@ -954,8 +954,8 @@
   if (radix < 1 || radix > (int) strlen (digits))
     {
       M4ERROR ((warning_status, 0,
-               "radix in builtin `%s' out of range (radix = %d)",
-               ARG (0), radix));
+               "radix %d in builtin `%s' out of range",
+               radix, ARG (0)));
       return;
     }
 
@@ -1304,7 +1304,7 @@
        if (str[i - 1] != 'X')
          break;
       obstack_grow (obs, str, i);
-      str = ntoa ((eval_t) getpid (), 10);
+      str = ntoa ((int32_t) getpid (), 10);
       len2 = strlen (str);
       if (len2 > len - i)
        obstack_grow0 (obs, str + len2 - (len - i), len - i);