From aa1075ea2f140dc7b2eec04199935b47111229db Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sun, 12 May 1996 16:38:08 +0000 Subject: Sun May 12 11:16:58 1996 Roland McGrath * mach/Machrules (%.udeps rule): Write deps for %_server.[ch] too. (%_server.[ch] rule): Don't depend on %.defs; use #include to get installed .defs file. * stdio-common/vfprintf.c (flockfile, funlockfile): Define to nothing for stdio. Fix fUNlockfile -> funlockfile for libio. * stdio-common/vfscanf.c: Likewise. Sat May 11 13:43:41 1996 Roland McGrath * hurd/hurdfault.c: Include faultexc_server.h instead of faultexc.h. * mach/Machrules (%.ir rule): Don't produce deps for imports. * elf/dl-fini.c (_dl_fini): Clear L->l_init_called after calling fn. * Makerules (install): Depend on $(slibdir)/libc.so$(libc.so-version). [!subdir] ($(libdir)/libc.so, $(common-objpfx)/libc-syms.so): Protect these targets and install dep on $(libdir)/libc.so with this. * hurd/Makefile: Removed all rules and defns for using code from Hurd sources and installing headers from there. * sysdeps/mach/hurd/errnos.awk: Set in_mach_errors to FILENAME when we set it. In Mach error matching clause, only match if FILENAME is still the same value. * sysdeps/mach/hurd/Makefile: Don't include sysdeps/mach/Makefile; $(mach-srcdir) no longer exists. (hurd-srcdir): Variable removed. (includes): Don't append -I$(hurd-srcdir). (last-includes): Variable removed. Remove vpath specs using $(hurd-srcdir). (mach-errno-h): New canned sequence. ($(common-objpfx)errnos.d): New target, generated included makefile to determine absolute file names of Mach headers to search for error codes and set variable mach-errnos-deps. ($(common-objpfx)stamp-errnos): Depend on $(mach-errnos-deps) instead of prior explicit list. (generated): Add errnos.d, stamp-errnos. * mach/Machrules (some-if-rtn): New variable and target; compute deps of some if routine and make all if routines depend on that .d file instead of static list of .h files. * mach/Makefile (mach/mach_interface.defs, mach/memory_object_user.defs): Targets removed. ($(objpfx)mach-syscalls.mk): Tweak this kludge so it doesn't depend directly on Mach sources. * sysdeps/mach/Makefile (mach-srcdir): Variable removed. (includes): Don't append -I$(mach-srcdir). Remove vpath specs using $(mach-srcdir). * hurd/Makefile (server-interfaces): Add faultexc. (sig): Remove it from here. (fault%.[ch]): Rule removed. (MIGFLAGS-faultexc): New variable. * hurd/faultexc.defs: New file. * mach/Machrules (%.ustamp rule): Pass $(MIGFLAGS-$*) to mig. (%_server.[ch] rule): Likewise. * mach/Makefile: Removed all rules and defns for using code from Mach sources and installing headers from there. * Makeconfig [$(build-shared)=yes] (link-libc): Append $(libc.so-version) to libc.so. * mach/Machrules (%.ustamp rule): Don't depend on %.defs. (%.udeps): New rule parallel to that one, generating included makefiles with -M output from `#include <%.defs>'. * Makerules (sed-remove-objpfx): Remove space before \ at eol. --- stdio-common/vfprintf.c | 10 ++++++---- stdio-common/vfscanf.c | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'stdio-common') diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index cde7496..6430a92 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -103,7 +103,7 @@ ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n)); } while (0) # define UNBUFFERED_P(S) ((S)->_IO_file_flags & _IO_UNBUFFERED) # define flockfile(S) _IO_flockfile (S) -# define fUNlockfile(S) _IO_funlockfile (S) +# define funlockfile(S) _IO_funlockfile (S) #else /* ! USE_IN_LIBIO */ /* This code is for use in the GNU C library. */ # include @@ -125,6 +125,8 @@ ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n)); } \ while (0) # define UNBUFFERED_P(s) ((s)->__buffer == NULL) +# define flockfile(S) /* nothing */ +# define funlockfile(S) /* nothing */ #endif /* USE_IN_LIBIO */ @@ -805,7 +807,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) /* Lock stream. */ flockfile (s); - + /* Write the literal text before the first format. */ outstring ((const UCHAR_T *) format, lead_str_end - (const UCHAR_T *) format); @@ -1001,7 +1003,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) /* Unlock stream. */ funlockfile (s); - + /* We processed the whole format without any positional parameters. */ return done; @@ -1263,7 +1265,7 @@ do_positional: /* Unlock the stream. */ funlockfile (s); - + return done; } diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 4b4dd11..9cdad7b 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -26,7 +26,6 @@ Cambridge, MA 02139, USA. */ #include #include - #ifdef __GNUC__ #define HAVE_LONGLONG #define LONGLONG long long @@ -82,6 +81,8 @@ Cambridge, MA 02139, USA. */ return EOF; \ } \ } while (0) +# define flockfile(S) _IO_flockfile (S) +# define funlockfile(S) _IO_funlockfile (S) #else # define inchar() ((c = getc (s)), (void) ++read_in, c) # define conv_error() do { \ @@ -108,6 +109,8 @@ Cambridge, MA 02139, USA. */ return EOF; \ } \ } while (0) +# define flockfile(S) /* nothing */ +# define funlockfile(S) /* nothing */ #endif @@ -196,7 +199,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) /* Lock the stream. */ flockfile (s); - + c = inchar (); /* Run through the format string. */ @@ -807,7 +810,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) /* Unlock stream. */ funlockfile (s); - + return ((void) (c == EOF || ungetc (c, s)), done); } -- cgit v1.1