* libgfortran.h (itoa): Rename to gfc_itoa.

	* io/write.c (itoa): Same.
	* runtime/environ.c (itoa): Same.
	* runtime/error.c (itoa): Same.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92380 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 6b331c6669a8f5078d342795975c99798d279ce3..452bb4aa76c1b7227e7e8a199bcfbeda3bc7c930 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-19  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
+
+       PR libfortran/19074
+       * libgfortran.h (itoa): Rename to gfc_itoa.
+       * io/write.c (itoa): Same.
+       * runtime/environ.c (itoa): Same.
+       * runtime/error.c (itoa): Same.
+
 2004-12-15  Bud Davis  <bdavis9659@comcast.net>
             Steven G. Kargl  <kargls@comcast.net>
 

diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c
index 4d9c015dca3849a3090343cbb16fadb0d9e82bd1..f7261ae0b01aaf3a6136651d5bc2766c0989952b 100644 (file)
--- a/libgfortran/io/write.c
+++ b/libgfortran/io/write.c
@@ -928,7 +928,7 @@ btoa (uint64_t n)
 void
 write_i (fnode * f, const char *p, int len)
 {
-  write_decimal (f, p, len, (void *) itoa);
+  write_decimal (f, p, len, (void *) gfc_itoa);
 }
 
 
@@ -1042,7 +1042,7 @@ write_integer (const char *source, int length)
   int digits;
   int width;
 
-  q = itoa (extract_int (source, length));
+  q = gfc_itoa (extract_int (source, length));
 
   switch (length)
     {

diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h
index ca8beb2fc9493500cee8fd3565301f85a7482222..06a68c6ef07bba5e32750db416b02e79ab26062d 100644 (file)
--- a/libgfortran/libgfortran.h
+++ b/libgfortran/libgfortran.h
@@ -370,8 +370,8 @@ internal_proto(get_args);
 
 /* error.c */
 
-extern char *itoa (int64_t);
-internal_proto(itoa);
+extern char *gfc_itoa (int64_t);
+internal_proto(gfc_itoa);
 
 extern char *xtoa (uint64_t);
 internal_proto(xtoa);

diff --git a/libgfortran/runtime/environ.c b/libgfortran/runtime/environ.c
index 02831f14a0e8c6540666cf9dfc4d3f06d6ec3a1b..19d407ea3a6fa0e254c7517474f78fc3116e4bb4 100644 (file)
--- a/libgfortran/runtime/environ.c
+++ b/libgfortran/runtime/environ.c
@@ -551,7 +551,7 @@ check_buffered (int n)
     return 0;
 
   strcpy (name, "GFORTRAN_UNBUFFERED_");
-  strcat (name, itoa (n));
+  strcat (name, gfc_itoa (n));
 
   v.name = name;
   v.value = 2;

diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c
index 2ccaff0676873406845eac581244a328013f1c21..2e49869c9c2a8dac965db59341a080d3b3f3929a 100644 (file)
--- a/libgfortran/runtime/error.c
+++ b/libgfortran/runtime/error.c
@@ -60,7 +60,7 @@ static char buffer[32];               /* buffer for integer/ascii conversions */
 /* Returns a pointer to a static buffer. */
 
 char *
-itoa (int64_t n)
+gfc_itoa (int64_t n)
 {
   int negative;
   char *p;
@@ -177,7 +177,7 @@ st_printf (const char *format, ...)
          break;
 
        case 'd':
-         q = itoa (va_arg (arg, int));
+         q = gfc_itoa (va_arg (arg, int));
          count = strlen (q);
 
          p = salloc_w (s, &count);
@@ -254,7 +254,7 @@ st_sprintf (char *buffer, const char *format, ...)
          break;
 
        case 'd':
-         p = itoa (va_arg (arg, int));
+         p = gfc_itoa (va_arg (arg, int));
          count = strlen (p);
 
          memcpy (buffer, p, count);