diff options
| author | aaronwl <aaronwl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-19 18:54:00 +0000 |
|---|---|---|
| committer | aaronwl <aaronwl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-19 18:54:00 +0000 |
| commit | 34991dc4399911aa11849768552bb83a95bd4283 (patch) | |
| tree | d07d532b01cb171c567f84dbc83f554db986b04b /libgfortran | |
| parent | b24c1dae7e4c14e16f4f266faf64fd20707d3852 (diff) | |
| download | gcc-34991dc4399911aa11849768552bb83a95bd4283.tar.gz | |
* 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
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 8 | ||||
| -rw-r--r-- | libgfortran/io/write.c | 4 | ||||
| -rw-r--r-- | libgfortran/libgfortran.h | 4 | ||||
| -rw-r--r-- | libgfortran/runtime/environ.c | 2 | ||||
| -rw-r--r-- | libgfortran/runtime/error.c | 6 |
5 files changed, 16 insertions, 8 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 6b331c6669a..452bb4aa76c 100644 --- 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 4d9c015dca3..f7261ae0b01 100644 --- 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 ca8beb2fc94..06a68c6ef07 100644 --- 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 02831f14a0e..19d407ea3a6 100644 --- 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 2ccaff06768..2e49869c9c2 100644 --- 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); |