* stdio-common/vfprintf.c (process_arg): Move __printf_fphex and
authoraj <aj>
Wed, 27 Dec 2000 07:55:49 +0000 (07:55 +0000)
committeraj <aj>
Wed, 27 Dec 2000 07:55:49 +0000 (07:55 +0000)
__printf_fp prototypes to ...
* include/printf.h: ...here.

include/printf.h
stdio-common/vfprintf.c

index 777e958..a025eac 100644 (file)
@@ -1 +1,11 @@
+#ifndef        _PRINTF_H
+
 #include <stdio-common/printf.h>
+
+/* Now define the internal interfaces.  */
+extern int __printf_fphex (FILE *, const struct printf_info *,
+                          const void *const *);
+extern int __printf_fp (FILE *, const struct printf_info *,
+                       const void *const *);
+
+#endif
index 822728e..62750b4 100644 (file)
@@ -798,8 +798,6 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
     LABEL (form_float):                                                              \
       {                                                                              \
        /* Floating-point number.  This is handled by printf_fp.c.  */        \
-       extern int __printf_fp __P ((FILE *, const struct printf_info *,      \
-                                    const void **const));                    \
        const void *ptr;                                                      \
        int function_done;                                                    \
                                                                              \
@@ -848,9 +846,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
                                                                              \
     LABEL (form_floathex):                                                   \
       {                                                                              \
-        /* FLoating point number printed as hexadecimal number.  */          \
-       extern int __printf_fphex __P ((FILE *, const struct printf_info *,   \
-                                       const void **const));                 \
+        /* Floating point number printed as hexadecimal number.  */          \
        const void *ptr;                                                      \
        int function_done;                                                    \
                                                                              \
@@ -919,7 +915,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
        else                                                                  \
          {                                                                   \
            /* Write "(nil)" for a nil pointer.  */                           \
-           string = (CHAR_T *) L_("(nil)");                                  \
+           string = (CHAR_T *) L_("(nil)");                                  \
            /* Make sure the full string "(nil)" is printed.  */              \
            if (prec < 5)                                                     \
              prec = 5;                                                       \