Move stdio-common/_itoa.h to sysdeps/generic

diff --git a/ChangeLog b/ChangeLog
index 268d0ac84634e4b733a3709d65bf50e6cd9d25a1..edac2dc045afee88c98e9166b90ae02db47eee0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * debug/backtracesymsfd.c: Include <_itoa.h> instead of
+       <stdio-common/_itoa.h>.
+       * debug/segfault.c: Likewise.
+       * elf/dl-cache.c: Likewise.
+       * elf/dl-minimal.c: Likewise.
+       * elf/dl-misc.c: Likewise.
+       * elf/dl-sysdep.c: Likewise.
+       * elf/dl-version.c: Likewise.
+       * elf/rtld.c: Likewise.
+       * hurd/hurdsock.c: Likewise.
+       * hurd/lookup-retry.c: Likewise.
+       * malloc/malloc.c: Likewise.
+       * malloc/mtrace.c: Likewise.
+       * nscd/nscd_getgr_r.c: Likewise.
+       * nscd/nscd_getpw_r.c: Likewise.
+       * nscd/nscd_getserv_r.c: Likewise.
+       * posix/getopt_init.c: Likewise.
+       * posix/wordexp.c: Likewise.
+       * stdio-common/_itoa.c: Likewise.
+       * stdio-common/printf_fphex.c: Likewise.
+       * stdio-common/vfprintf.c: Likewise.
+       * string/_strerror.c: Likewise.
+       * sysdeps/generic/elf/backtracesymsfd.c: Likewise.
+       * sysdeps/i386/i686/hp-timing.h: Likewise.
+       * sysdeps/mach/_strerror.c: Likewise.
+       * sysdeps/mach/hurd/powerpc/register-dump.h: Likewise.
+       * sysdeps/mach/hurd/sethostid.c: Likewise.
+       * sysdeps/mach/hurd/xmknodat.c: Likewise.
+       * sysdeps/mach/xpg-strerror.c: Likewise.
+       * sysdeps/powerpc/powerpc32/dl-machine.c: Likewise.
+       * sysdeps/powerpc/powerpc32/power4/hp-timing.h: Likewise.
+       * sysdeps/powerpc/powerpc32/register-dump.h: Likewise.
+       * sysdeps/powerpc/powerpc64/dl-machine.c: Likewise.
+       * sysdeps/powerpc/powerpc64/hp-timing.h: Likewise.
+       * sysdeps/powerpc/powerpc64/register-dump.h: Likewise.
+       * sysdeps/sparc/sparc32/sparcv9/hp-timing.h: Likewise.
+       * sysdeps/sparc/sparc64/hp-timing.h: Likewise.
+       * sysdeps/unix/sysv/linux/fd_to_filename.h: Likewise.
+       * sysdeps/unix/sysv/linux/futimes.c: Likewise.
+       * sysdeps/unix/sysv/linux/i386/register-dump.h: Likewise.
+       * sysdeps/unix/sysv/linux/ptsname.c: Likewise.
+       * sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h: Likewise.
+       * sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h: Likewise.
+       * sysdeps/unix/sysv/linux/sh/sh3/register-dump.h: Likewise.
+       * sysdeps/unix/sysv/linux/sh/sh4/register-dump.h: Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h: Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h: Likewise.
+       * sysdeps/unix/sysv/linux/ttyname.c: Likewise.
+       * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise.
+       * sysdeps/unix/sysv/linux/x86_64/register-dump.h: Likewise.
+
+       * stdio-common/_itoa.c: Include <_itoa.h> instead of "_itoa.h".
+
+       * stdio-common/_itoa.h: Moved to ...
+       * sysdeps/generic/_itoa.h: Here.
+
+       * stdio-common/_itowa.c: Include <_itowa.h> instead of "_itowa.h".
+
+       * stdio-common/printf_fphex.c: Include <_itoa.h> and <_itowa.h>
+       instead of "_itoa.h" and "_itowa.h".
+       * stdio-common/vfprintf.: Likewise.
+
 2012-03-20  H.J. Lu  <hongjiu.lu@intel.com>
 
        * sysdeps/x86_64/fpu/bits/mathinline.h: Don't include

diff --git a/debug/backtracesymsfd.c b/debug/backtracesymsfd.c
index fe247d8cc8b50c19fd72680ff6e624d48f6b5efc..2345853d8057e6a2f83319f356deda67e04e2dcc 100644 (file)
--- a/debug/backtracesymsfd.c
+++ b/debug/backtracesymsfd.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <sys/uio.h>
 
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <not-cancel.h>
 
 #if __ELF_NATIVE_CLASS == 32

diff --git a/debug/segfault.c b/debug/segfault.c
index 18f811580ba9f78ea5389649de05211ef46a2511..98886dbf152f6ea3dd459ebbd7b0827baade072f 100644 (file)
--- a/debug/segfault.c
+++ b/debug/segfault.c
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <ldsodefs.h>
 
 #include <bp-checks.h>

diff --git a/elf/dl-cache.c b/elf/dl-cache.c
index 2e6f88b326d95dd48e3e6b86d44c16b562fdafce..0357dffc426df5df258815210ecd9ef6eda5201e 100644 (file)
--- a/elf/dl-cache.c
+++ b/elf/dl-cache.c
@@ -24,7 +24,7 @@
 #include <dl-cache.h>
 #include <dl-procinfo.h>
 
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #ifndef _DL_PLATFORMS_COUNT
 # define _DL_PLATFORMS_COUNT 0

diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
index 3a984afb1c45514ba1fe90455d52e6482afe4882..316de99b8f1a70e39dfb6691f9129b349ae3bf29 100644 (file)
--- a/elf/dl-minimal.c
+++ b/elf/dl-minimal.c
@@ -26,7 +26,7 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #include <assert.h>
 

diff --git a/elf/dl-misc.c b/elf/dl-misc.c
index 9bf642daaaf7f5c700992e407925591dc161aac9..22fbba38d4c86dc3d16b501bd7321903ee2f2281 100644 (file)
--- a/elf/dl-misc.c
+++ b/elf/dl-misc.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <sysdep.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <bits/libc-lock.h>
 
 /* Read the whole contents of FILE into new mmap'd space with given

diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index 0920cc155a443c22297b5e756fe10fd6c5558e55..1cb4460a02f5139c5f7a028ca4e1740d0b788865 100644 (file)
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <fpu_control.h>
 
 #include <entry.h>

diff --git a/elf/dl-version.c b/elf/dl-version.c
index e314e02d0749b756d86883ae620c2001af2192ef..af7f89960df46b233ff9118c9eecf5a7302dda00 100644 (file)
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #include <assert.h>
 

diff --git a/elf/rtld.c b/elf/rtld.c
index 3e15447f7a5f3424663a08017dd6f4497f9fb3e9..1cc9cf3fe5395e2cd71cb1b0a125c443db146448 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -27,7 +27,7 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <entry.h>
 #include <fpu_control.h>
 #include <hp-timing.h>

diff --git a/hurd/hurdsock.c b/hurd/hurdsock.c
index 170a3f6185a5734d31dacd7fc96549e469e79ae9..f3611ecf2711ae64a14cbf395a242445e4a0b2b8 100644 (file)
--- a/hurd/hurdsock.c
+++ b/hurd/hurdsock.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <hurd/paths.h>
 #include <stdio.h>
-#include "stdio-common/_itoa.h"
+#include <_itoa.h>
 #include <cthreads.h>          /* For `struct mutex'.  */
 #include "hurdmalloc.h"                /* XXX */
 

diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c
index c65eb5ad57f252b5f562a7392785f11dc9a03f3a..3c506a043a0068019bb1aad56470a8dfa984731e 100644 (file)
--- a/hurd/lookup-retry.c
+++ b/hurd/lookup-retry.c
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <fcntl.h>
 #include <string.h>
-#include "stdio-common/_itoa.h"
+#include <_itoa.h>
 
 /* Translate the error from dir_lookup into the error the user sees.  */
 static inline error_t

diff --git a/malloc/malloc.c b/malloc/malloc.c
index d7d79e03fa2a2f53a35d2441061b421e1a65542d..79cdc52330d970cb0a113b882020adb079c94d6f 100644 (file)
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -218,7 +218,7 @@
 #include <malloc-machine.h>
 
 #include <atomic.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <bits/wordsize.h>
 #include <sys/sysinfo.h>
 

diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 67e3e44336cba86f7f2b9fc599b5de199d31bcaa..e299a16239fe4098a644505ae79c34bd333d75e9 100644 (file)
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #include <libc-internal.h>
 

diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index ac3d85fc39c95c6b0878330d9cbef1d1fac1e8db..54372e4ef0aba7ee738f821d230c30c1bb264565 100644 (file)
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -31,7 +31,7 @@
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <not-cancel.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #include "nscd-client.h"
 #include "nscd_proto.h"

diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index 409b672ee02cd02e4a05bbe607e7f01aa7494fe1..e405057d1627aff82d085951c3d42ad5f399db05 100644 (file)
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -30,7 +30,7 @@
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <not-cancel.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #include "nscd-client.h"
 #include "nscd_proto.h"

diff --git a/nscd/nscd_getserv_r.c b/nscd/nscd_getserv_r.c
index ff85d8299fb3a7e19c9f447c1bfba8f61e80806b..acf7e22f82582dbbca7da798b31ec46dac2b1aa9 100644 (file)
--- a/nscd/nscd_getserv_r.c
+++ b/nscd/nscd_getserv_r.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <string.h>
 #include <not-cancel.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #include "nscd-client.h"
 #include "nscd_proto.h"

diff --git a/posix/getopt_init.c b/posix/getopt_init.c
index 9bcbd9c00d07545a8acea1da139061d32fc04624..55003d4b7e0f9edee04dfdabce65d01f27c62858 100644 (file)
--- a/posix/getopt_init.c
+++ b/posix/getopt_init.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* Variable to synchronize work.  */
 char *__getopt_nonoption_flags;

diff --git a/posix/wordexp.c b/posix/wordexp.c
index ece5109ae9d87de557643dcfcaee6ac6486222f1..5ace13720b6a54e5b9f1b63b9c26bc4d3cb08732 100644 (file)
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -42,7 +42,7 @@
 #include <kernel-features.h>
 
 #include <bits/libc-lock.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* Undefine the following line for the production version.  */
 /* #define NDEBUG 1 */

diff --git a/stdio-common/_itoa.c b/stdio-common/_itoa.c
index e52f666ffacb4797822022d2a891855bef255f42..3dfff8ff640572ccac20db7b70bf91a832217363 100644 (file)
--- a/stdio-common/_itoa.c
+++ b/stdio-common/_itoa.c
@@ -25,7 +25,7 @@
 #include <stdlib/gmp-impl.h>
 #include <stdlib/longlong.h>
 
-#include "_itoa.h"
+#include <_itoa.h>
 
 
 /* Canonize environment.  For some architectures not all values might

diff --git a/stdio-common/_itoa.h b/stdio-common/_itoa.h
deleted file mode 100644 (file)
index 8870ee0..0000000
--- a/stdio-common/_itoa.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Internal function for converting integers to ASCII.
-   Copyright (C) 1994-1999,2002,2003,2007 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _ITOA_H
-#define _ITOA_H
-
-#include <limits.h>
-
-/* Convert VALUE into ASCII in base BASE (2..36).
-   Write backwards starting the character just before BUFLIM.
-   Return the address of the first (left-to-right) character in the number.
-   Use upper case letters iff UPPER_CASE is nonzero.  */
-
-extern char *_itoa (unsigned long long int value, char *buflim,
-                   unsigned int base, int upper_case);
-
-extern const char _itoa_upper_digits[];
-extern const char _itoa_upper_digits_internal[] attribute_hidden;
-extern const char _itoa_lower_digits[];
-extern const char _itoa_lower_digits_internal[] attribute_hidden;
-
-#ifndef NOT_IN_libc
-extern char *_itoa_word (unsigned long value, char *buflim,
-                        unsigned int base, int upper_case);
-#else
-static inline char * __attribute__ ((unused, always_inline))
-_itoa_word (unsigned long value, char *buflim,
-           unsigned int base, int upper_case)
-{
-  const char *digits = (upper_case
-# if defined IS_IN_rtld
-                       ? INTUSE(_itoa_upper_digits)
-                       : INTUSE(_itoa_lower_digits)
-# else
-                       ? _itoa_upper_digits
-                       : _itoa_lower_digits
-# endif
-                      );
-
-  switch (base)
-    {
-# define SPECIAL(Base)                                                       \
-    case Base:                                                               \
-      do                                                                     \
-       *--buflim = digits[value % Base];                                     \
-      while ((value /= Base) != 0);                                          \
-      break
-
-      SPECIAL (10);
-      SPECIAL (16);
-      SPECIAL (8);
-    default:
-      do
-       *--buflim = digits[value % base];
-      while ((value /= base) != 0);
-    }
-  return buflim;
-}
-# undef SPECIAL
-#endif
-
-/* Similar to the _itoa functions, but output starts at buf and pointer
-   after the last written character is returned.  */
-extern char *_fitoa_word (unsigned long value, char *buf, unsigned int base,
-                         int upper_case) attribute_hidden;
-extern char *_fitoa (unsigned long long value, char *buf, unsigned int base,
-                    int upper_case) attribute_hidden;
-
-#if LONG_MAX == LLONG_MAX
-/* No need for special long long versions.  */
-# define _itoa(value, buf, base, upper_case) \
-  _itoa_word (value, buf, base, upper_case)
-# define _fitoa(value, buf, base, upper_case) \
-  _fitoa_word (value, buf, base, upper_case)
-#endif
-
-#endif /* itoa.h */

diff --git a/stdio-common/_itowa.c b/stdio-common/_itowa.c
index 8047c877c90f50f727d7478ce0db518e56be47a0..1ebc712b4365aab899436c451d554fc4f3a3b5c7 100644 (file)
--- a/stdio-common/_itowa.c
+++ b/stdio-common/_itowa.c
@@ -24,7 +24,7 @@
 #include <stdlib/gmp-impl.h>
 #include <stdlib/longlong.h>
 
-#include "_itowa.h"
+#include <_itowa.h>
 
 
 /* Canonize environment.  For some architectures not all values might

diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c
index 01142f9f6d881248c41976dbd933a38e3e90d1a2..97ed83be981ff5304908c34927e4bb28ccd16504 100644 (file)
--- a/stdio-common/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-#include "_itoa.h"
-#include "_itowa.h"
+#include <_itoa.h>
+#include <_itowa.h>
 #include <locale/localeinfo.h>
 
 /* #define NDEBUG 1*/          /* Undefine this for debugging assertions.  */

diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index e454927bfd37cb4841b2a80ee2a3d7ea9fe0dc31..1e904833a37d35cb9ca79a730126c8b81880fc42 100644 (file)
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -26,7 +26,7 @@
 #include <wchar.h>
 #include <bits/libc-lock.h>
 #include <sys/param.h>
-#include "_itoa.h"
+#include <_itoa.h>
 #include <locale/localeinfo.h>
 #include <stdio.h>
 
@@ -102,7 +102,7 @@
 # define ISDIGIT(Ch)   ((unsigned int) ((Ch) - L'0') < 10)
 # define STR_LEN(Str)  __wcslen (Str)
 
-# include "_itowa.h"
+# include <_itowa.h>
 
 # define PUT(F, S, N)  _IO_sputn ((F), (S), (N))
 # define PAD(Padchar) \

diff --git a/string/_strerror.c b/string/_strerror.c
index 87540797d92aa3094d1d74fc5ca581850c97e3bc..6af622634f37f966aa17681a1328d4486bb6d68b 100644 (file)
--- a/string/_strerror.c
+++ b/string/_strerror.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* It is critical here that we always use the `dcgettext' function for
    the message translation.  Since <libintl.h> only defines the macro

diff --git a/sysdeps/generic/_itoa.h b/sysdeps/generic/_itoa.h
new file mode 100644 (file)
index 0000000..8870ee0
--- /dev/null
+++ b/sysdeps/generic/_itoa.h
@@ -0,0 +1,92 @@
+/* Internal function for converting integers to ASCII.
+   Copyright (C) 1994-1999,2002,2003,2007 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef _ITOA_H
+#define _ITOA_H
+
+#include <limits.h>
+
+/* Convert VALUE into ASCII in base BASE (2..36).
+   Write backwards starting the character just before BUFLIM.
+   Return the address of the first (left-to-right) character in the number.
+   Use upper case letters iff UPPER_CASE is nonzero.  */
+
+extern char *_itoa (unsigned long long int value, char *buflim,
+                   unsigned int base, int upper_case);
+
+extern const char _itoa_upper_digits[];
+extern const char _itoa_upper_digits_internal[] attribute_hidden;
+extern const char _itoa_lower_digits[];
+extern const char _itoa_lower_digits_internal[] attribute_hidden;
+
+#ifndef NOT_IN_libc
+extern char *_itoa_word (unsigned long value, char *buflim,
+                        unsigned int base, int upper_case);
+#else
+static inline char * __attribute__ ((unused, always_inline))
+_itoa_word (unsigned long value, char *buflim,
+           unsigned int base, int upper_case)
+{
+  const char *digits = (upper_case
+# if defined IS_IN_rtld
+                       ? INTUSE(_itoa_upper_digits)
+                       : INTUSE(_itoa_lower_digits)
+# else
+                       ? _itoa_upper_digits
+                       : _itoa_lower_digits
+# endif
+                      );
+
+  switch (base)
+    {
+# define SPECIAL(Base)                                                       \
+    case Base:                                                               \
+      do                                                                     \
+       *--buflim = digits[value % Base];                                     \
+      while ((value /= Base) != 0);                                          \
+      break
+
+      SPECIAL (10);
+      SPECIAL (16);
+      SPECIAL (8);
+    default:
+      do
+       *--buflim = digits[value % base];
+      while ((value /= base) != 0);
+    }
+  return buflim;
+}
+# undef SPECIAL
+#endif
+
+/* Similar to the _itoa functions, but output starts at buf and pointer
+   after the last written character is returned.  */
+extern char *_fitoa_word (unsigned long value, char *buf, unsigned int base,
+                         int upper_case) attribute_hidden;
+extern char *_fitoa (unsigned long long value, char *buf, unsigned int base,
+                    int upper_case) attribute_hidden;
+
+#if LONG_MAX == LLONG_MAX
+/* No need for special long long versions.  */
+# define _itoa(value, buf, base, upper_case) \
+  _itoa_word (value, buf, base, upper_case)
+# define _fitoa(value, buf, base, upper_case) \
+  _fitoa_word (value, buf, base, upper_case)
+#endif
+
+#endif /* itoa.h */

diff --git a/sysdeps/generic/elf/backtracesymsfd.c b/sysdeps/generic/elf/backtracesymsfd.c
index 8b4a836ce9c8f60b14907b83ede0486d683e6c2f..3562c50a78920c2ac38f3e4b759d0bba55ff6c48 100644 (file)
--- a/sysdeps/generic/elf/backtracesymsfd.c
+++ b/sysdeps/generic/elf/backtracesymsfd.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <sys/uio.h>
 
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <ldsodefs.h>
 
 #if __ELF_NATIVE_CLASS == 32

diff --git a/sysdeps/i386/i686/hp-timing.h b/sysdeps/i386/i686/hp-timing.h
index 852f77820ff6daa46f1473d7020f3b402f631f6e..1d8684ce20396e492884e1ce156bf46e8ced044b 100644 (file)
--- a/sysdeps/i386/i686/hp-timing.h
+++ b/sysdeps/i386/i686/hp-timing.h
@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* The macros defined here use the timestamp counter in i586 and up versions
    of the x86 processors.  They provide a very accurate way to measure the

diff --git a/sysdeps/mach/_strerror.c b/sysdeps/mach/_strerror.c
index 3c0928825f613ac9e7b5e60a485cb0165f6767c2..e3a5c8e3c8682203f5b6c593c96a315776d838ee 100644 (file)
--- a/sysdeps/mach/_strerror.c
+++ b/sysdeps/mach/_strerror.c
@@ -21,7 +21,7 @@
 #include <mach/error.h>
 #include <errorlib.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* It is critical here that we always use the `dcgettext' function for
    the message translation.  Since <libintl.h> only defines the macro

diff --git a/sysdeps/mach/hurd/powerpc/register-dump.h b/sysdeps/mach/hurd/powerpc/register-dump.h
index 258579727efc281a9355d4007013bceba36cf191..80d545e488015038f809726f2a0d25abf2c14e63 100644 (file)
--- a/sysdeps/mach/hurd/powerpc/register-dump.h
+++ b/sysdeps/mach/hurd/powerpc/register-dump.h
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* This prints out the information in the following form: */
 static const char dumpform[] = "\

diff --git a/sysdeps/mach/hurd/sethostid.c b/sysdeps/mach/hurd/sethostid.c
index d1ff1b0f5bfffcf5cae669d722dedadc0b0fc914..7fadf6aa8503876e64404dd91054514c5f4456f0 100644 (file)
--- a/sysdeps/mach/hurd/sethostid.c
+++ b/sysdeps/mach/hurd/sethostid.c
@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <hurd.h>
 #include "hurdhost.h"
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* Set the current machine's Internet number to ID.
    This call is restricted to the super-user.  */

diff --git a/sysdeps/mach/hurd/xmknodat.c b/sysdeps/mach/hurd/xmknodat.c
index a37b918822f7e7c4381567c77a96d4ab893c749d..acd1a8c683d9a5367afc4ec87be1f1241c906919 100644 (file)
--- a/sysdeps/mach/hurd/xmknodat.c
+++ b/sysdeps/mach/hurd/xmknodat.c
@@ -23,7 +23,7 @@
 #include <hurd/fd.h>
 #include <hurd/paths.h>
 #include <fcntl.h>
-#include "stdio-common/_itoa.h"
+#include <_itoa.h>
 #include <string.h>
 #include <sys/types.h>
 

diff --git a/sysdeps/mach/xpg-strerror.c b/sysdeps/mach/xpg-strerror.c
index 997c5b6a3f010d26aed8ff2151038df8f66ee5b5..421d75803dd5a4d4c2e7dd150c1069d9d4d1d27f 100644 (file)
--- a/sysdeps/mach/xpg-strerror.c
+++ b/sysdeps/mach/xpg-strerror.c
@@ -23,7 +23,7 @@
 #include <mach/error.h>
 #include <errorlib.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* It is critical here that we always use the `dcgettext' function for
    the message translation.  Since <libintl.h> only defines the macro

diff --git a/sysdeps/powerpc/powerpc32/dl-machine.c b/sysdeps/powerpc/powerpc32/dl-machine.c
index 9ad6bbbc0b98579b04bcf1e9900aeec486b94d0c..e5354801336ebce39a7f0602e03e297d91f93a95 100644 (file)
--- a/sysdeps/powerpc/powerpc32/dl-machine.c
+++ b/sysdeps/powerpc/powerpc32/dl-machine.c
@@ -23,7 +23,7 @@
 #include <ldsodefs.h>
 #include <elf/dynamic-link.h>
 #include <dl-machine.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* The value __cache_line_size is defined in dl-sysdep.c and is initialised
    by _dl_sysdep_start via DL_PLATFORM_INIT.  */

diff --git a/sysdeps/powerpc/powerpc32/power4/hp-timing.h b/sysdeps/powerpc/powerpc32/power4/hp-timing.h
index 8370f726914593df3671b40fc57e893472b0c457..a80168a7c98a6c04a198ddbba3a56a2abccf63b7 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power4/hp-timing.h
+++ b/sysdeps/powerpc/powerpc32/power4/hp-timing.h
@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <atomic.h>
 
 /* The macros defined here use the powerpc 64-bit time base register.

diff --git a/sysdeps/powerpc/powerpc32/register-dump.h b/sysdeps/powerpc/powerpc32/register-dump.h
index d9b520e5e793a4d0e6b448582e5c77ca6f3332cd..2936de240bb9a95036aaffd8b43b4ff00e64a013 100644 (file)
--- a/sysdeps/powerpc/powerpc32/register-dump.h
+++ b/sysdeps/powerpc/powerpc32/register-dump.h
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* This prints out the information in the following form: */
 static const char dumpform[] = "\

diff --git a/sysdeps/powerpc/powerpc64/dl-machine.c b/sysdeps/powerpc/powerpc64/dl-machine.c
index 6a8e68f39ee35ce2d526d34d669a72002eefaa48..8e216ed87c7adf5b8d7be8a71124d954584270e0 100644 (file)
--- a/sysdeps/powerpc/powerpc64/dl-machine.c
+++ b/sysdeps/powerpc/powerpc64/dl-machine.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <ldsodefs.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <dl-machine.h>
 
 void

diff --git a/sysdeps/powerpc/powerpc64/hp-timing.h b/sysdeps/powerpc/powerpc64/hp-timing.h
index b4cf2a42cb73111cac19de0b25a7b91a050529d0..dc10bc4f65cc95104c3c61eb320e692811f3b258 100644 (file)
--- a/sysdeps/powerpc/powerpc64/hp-timing.h
+++ b/sysdeps/powerpc/powerpc64/hp-timing.h
@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <atomic.h>
 
 /* The macros defined here use the powerpc 64-bit time base register.

diff --git a/sysdeps/powerpc/powerpc64/register-dump.h b/sysdeps/powerpc/powerpc64/register-dump.h
index e301b0fe61d0d844afe4f09b3492d91716d31d18..917886db2f2c21c83899087a188fb5116949bad3 100644 (file)
--- a/sysdeps/powerpc/powerpc64/register-dump.h
+++ b/sysdeps/powerpc/powerpc64/register-dump.h
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* This prints out the information in the following form: */
 static const char dumpform[] = "\

diff --git a/sysdeps/sparc/sparc32/sparcv9/hp-timing.h b/sysdeps/sparc/sparc32/sparcv9/hp-timing.h
index b90bb841521f836d5aad7e07876bd563bf3df747..d0f896da5cc26c60bc7a02eee07f8a03e4f333c5 100644 (file)
--- a/sysdeps/sparc/sparc32/sparcv9/hp-timing.h
+++ b/sysdeps/sparc/sparc32/sparcv9/hp-timing.h
@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #define HP_TIMING_AVAIL                (1)
 #define HP_TIMING_INLINE       (1)

diff --git a/sysdeps/sparc/sparc64/hp-timing.h b/sysdeps/sparc/sparc64/hp-timing.h
index b68f653fb8d8cf44db83784dc26cc947a59a29ca..684b846f5514b74b654ec44e90deb6fa04c122a4 100644 (file)
--- a/sysdeps/sparc/sparc64/hp-timing.h
+++ b/sysdeps/sparc/sparc64/hp-timing.h
@@ -22,7 +22,7 @@
 
 #include <string.h>
 #include <sys/param.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 #define HP_TIMING_AVAIL                (1)
 #define HP_TIMING_INLINE       (1)

diff --git a/sysdeps/unix/sysv/linux/fd_to_filename.h b/sysdeps/unix/sysv/linux/fd_to_filename.h
index feefc2b78ec7890c42cc25c56982b85c14081258..ee939af1592ff2fcb2708facc6e10b5ad0e4cd99 100644 (file)
--- a/sysdeps/unix/sysv/linux/fd_to_filename.h
+++ b/sysdeps/unix/sysv/linux/fd_to_filename.h
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 static inline const char *
 fd_to_filename (int fd)

diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c
index cd76f6ffbad88bd029d7233f5381601de096ec5c..913bd105fc3c0ac345f69b6abfcf6697cefb5e66 100644 (file)
--- a/sysdeps/unix/sysv/linux/futimes.c
+++ b/sysdeps/unix/sysv/linux/futimes.c
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <utime.h>
 #include <sys/time.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <fcntl.h>
 
 #include <kernel-features.h>

diff --git a/sysdeps/unix/sysv/linux/i386/register-dump.h b/sysdeps/unix/sysv/linux/i386/register-dump.h
index d2c5c3fcaf6c568b08b8c2c678cd9c45f4bc21c2..7f54f67430b437710516dc4fa5dea315e05657eb 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/register-dump.h
+++ b/sysdeps/unix/sysv/linux/i386/register-dump.h
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* We will print the register dump in this format:
 

diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c
index 41edd8f8fe1b998b12c59c26231f12fde77969cf..fb097698fb3a28179140c5a26f476cfd0789ce29 100644 (file)
--- a/sysdeps/unix/sysv/linux/ptsname.c
+++ b/sysdeps/unix/sysv/linux/ptsname.c
@@ -26,7 +26,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* Check if DEV corresponds to a master pseudo terminal device.  */
 #define MASTER_P(Dev)                                                         \

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h b/sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h
index 0c3b83c24bff55ce1bfd0e5524134010486bb872..1f1a85983e68de6ebb310e1f5f4bd927867c6460 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/register-dump.h
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* We will print the register dump in this format:
 

diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h b/sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h
index 0cf89f14cae7ab9f5df08612fe2683baa056f30d..671481df7590ddce195993810bdd5064fa7bb80e 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/register-dump.h
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* We will print the register dump in this format:
 

diff --git a/sysdeps/unix/sysv/linux/sh/sh3/register-dump.h b/sysdeps/unix/sysv/linux/sh/sh3/register-dump.h
index 9562882eda2c2c9dc8ccca535182ff9e64b545ce..510863e7bf21c9f8dc4334403e11be3d1cd4e8e7 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/sh3/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sh/sh3/register-dump.h
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* We will print the register dump in this format:
 

diff --git a/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h b/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
index d31ca1f914857cb850a7764576d640e901e85347..f05447c373105603eeb9fee589c39a883d8df010 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sh/sh4/register-dump.h
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* We will print the register dump in this format:
 

diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h b/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h
index 0d0cdd6bb2043a10962fff56a5f53c3925508e73..be6ad74ae1699c4b603c35cb23eb8d09de88bd58 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* We will print the register dump in this format:
 

diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h b/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h
index 8ef6fde2fbeedc879b468e98f40afaa75463b18c..d8e76264f58035f2c4b17fccc4799170013c3e03 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/register-dump.h
@@ -18,7 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* We will print the register dump in this format:
 

diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c
index 70b2d51a003ed5655a9e85a53480227135207213..0cfb4740b8af17e04ef84216a47c675720b93a94 100644 (file)
--- a/sysdeps/unix/sysv/linux/ttyname.c
+++ b/sysdeps/unix/sysv/linux/ttyname.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <kernel-features.h>
 
 #if 0

diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c
index a12849a7772dd85384bb604ab2263ee0fdbd5458..f097311a1536f3ea01bf288becc4276350bf9605 100644 (file)
--- a/sysdeps/unix/sysv/linux/ttyname_r.c
+++ b/sysdeps/unix/sysv/linux/ttyname_r.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 #include <kernel-features.h>
 
 static int getttyname_r (char *buf, size_t buflen,

diff --git a/sysdeps/unix/sysv/linux/x86_64/register-dump.h b/sysdeps/unix/sysv/linux/x86_64/register-dump.h
index 83157916d9dc02874a894850f8f9781b714d09f2..3ef8e09b6bb06cabfdb8bb7bce764dde2df446d8 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/register-dump.h
+++ b/sysdeps/unix/sysv/linux/x86_64/register-dump.h
@@ -17,7 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sys/uio.h>
-#include <stdio-common/_itoa.h>
+#include <_itoa.h>
 
 /* We will print the register dump in this format: