aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-12-27 07:56:28 +0000
committerAndreas Jaeger <aj@suse.de>2000-12-27 07:56:28 +0000
commit03bac9acadcafeef0fcdc38719844167c77f412d (patch)
treebdd5f69403c9019f7c0b49ea5ca98fe3eccdeace
parent8001fa60142c49a43e66b6874271d136a2792469 (diff)
downloadglibc-03bac9acadcafeef0fcdc38719844167c77f412d.tar
glibc-03bac9acadcafeef0fcdc38719844167c77f412d.tar.gz
glibc-03bac9acadcafeef0fcdc38719844167c77f412d.tar.bz2
glibc-03bac9acadcafeef0fcdc38719844167c77f412d.zip
Update.
2000-12-26 Andreas Jaeger <aj@suse.de> * libio/getc_u.c: Include stdio.h via system path to get internal prototypes. * libio/getwc_u.c: Likewise. * stdlib/strfmon.c: Fix prototype of __printf_fp. * stdio-common/vfprintf.c (process_arg): Move __printf_fphex and __printf_fp prototypes to ... * include/printf.h: ...here. * include/stdio.h: Add some internal prototypes to shut up GCC. * include/stdlib.h: Likewise. * sysdeps/posix/sigpause.c (__sigpause): Use ISO C prototype declaration. * include/signal.h: Add prototypes for internal sigpause interfaces.
-rw-r--r--ChangeLog21
-rw-r--r--include/printf.h10
-rw-r--r--include/stdio.h4
-rw-r--r--include/stdlib.h4
-rw-r--r--libio/getc_u.c4
-rw-r--r--libio/getwc_u.c4
-rw-r--r--stdio-common/vfprintf.c8
-rw-r--r--stdlib/strfmon.c2
-rw-r--r--sysdeps/posix/sigpause.c4
9 files changed, 47 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b26efab46..494fa7b63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2000-12-26 Andreas Jaeger <aj@suse.de>
+
+ * libio/getc_u.c: Include stdio.h via system path to get internal
+ prototypes.
+ * libio/getwc_u.c: Likewise.
+
+ * stdlib/strfmon.c: Fix prototype of __printf_fp.
+
+ * stdio-common/vfprintf.c (process_arg): Move __printf_fphex and
+ __printf_fp prototypes to ...
+ * include/printf.h: ...here.
+
+ * include/stdio.h: Add some internal prototypes to shut up GCC.
+ * include/stdlib.h: Likewise.
+
+ * sysdeps/posix/sigpause.c (__sigpause): Use ISO C prototype
+ declaration.
+
+ * include/signal.h: Add prototypes for internal sigpause
+ interfaces.
+
2000-12-26 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/bits/byteswap.h (__bswap_64): Make it usable for
diff --git a/include/printf.h b/include/printf.h
index 777e958fb9..a025eac070 100644
--- a/include/printf.h
+++ b/include/printf.h
@@ -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
diff --git a/include/stdio.h b/include/stdio.h
index 419b58cb51..ce06a41842 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -60,6 +60,10 @@ extern void __funlockfile (FILE *__stream);
possible. */
extern int __ftrylockfile (FILE *__stream);
+extern int __getc_unlocked (FILE *__fp);
+extern wint_t __getwc_unlocked (FILE *__fp);
+
+
# endif
#endif
diff --git a/include/stdlib.h b/include/stdlib.h
index 2ca8ca1743..f57df69137 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -55,9 +55,13 @@ extern void _quicksort (void *const pbase, size_t total_elems,
extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
+extern void __cxa_finalize (void *d);
+
extern int __posix_memalign (void **memptr, size_t alignment, size_t size)
__attribute_malloc__;
+extern int __libc_system (const char *line);
+
#endif
#undef __Need_M_And_C
diff --git a/libio/getc_u.c b/libio/getc_u.c
index a722a315f2..b052cecc35 100644
--- a/libio/getc_u.c
+++ b/libio/getc_u.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1995,1996,1997,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
General Public License. */
#include "libioP.h"
-#include "stdio.h"
+#include <stdio.h>
#undef getc_unlocked
diff --git a/libio/getwc_u.c b/libio/getwc_u.c
index 606b4d24cc..8d2c5f4cce 100644
--- a/libio/getwc_u.c
+++ b/libio/getwc_u.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1993,1995,1996,1997,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU IO Library.
This library is free software; you can redistribute it and/or
@@ -24,7 +24,7 @@
General Public License. */
#include "libioP.h"
-#include "stdio.h"
+#include <stdio.h>
#undef getwc_unlocked
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 822728e7e7..62750b4389 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -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; \
diff --git a/stdlib/strfmon.c b/stdlib/strfmon.c
index 28249c1f62..49d88834fe 100644
--- a/stdlib/strfmon.c
+++ b/stdlib/strfmon.c
@@ -74,7 +74,7 @@
#endif
extern int __printf_fp (FILE *, const struct printf_info *,
- const void **const);
+ const void *const *);
/* This function determines the number of digit groups in the output.
The definition is in printf_fp.c. */
extern unsigned int __guess_grouping (unsigned int intdig_max,
diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c
index 4832c6a4a5..df6461d5cb 100644
--- a/sysdeps/posix/sigpause.c
+++ b/sysdeps/posix/sigpause.c
@@ -23,9 +23,7 @@
/* Set the mask of blocked signals to MASK,
wait for a signal to arrive, and then restore the mask. */
int
-__sigpause (sig_or_mask, is_sig)
- int sig_or_mask;
- int is_sig;
+__sigpause (int sig_or_mask, int is_sig)
{
sigset_t set;
int sig;