aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-12-22 00:32:43 +0000
committerUlrich Drepper <drepper@redhat.com>1996-12-22 00:32:43 +0000
commit01c901a56b165e57a17db349cc110f84f1b839c7 (patch)
tree04ee6d96167715cf56e2f009837fd6cc3d8347bf /stdio-common
parent7e3be507eed53cfe516ec101f312dac160e43bad (diff)
downloadglibc-01c901a56b165e57a17db349cc110f84f1b839c7.tar
glibc-01c901a56b165e57a17db349cc110f84f1b839c7.tar.gz
glibc-01c901a56b165e57a17db349cc110f84f1b839c7.tar.bz2
glibc-01c901a56b165e57a17db349cc110f84f1b839c7.zip
Sun Dec 22 00:01:27 1996 Ulrich Drepper <drepper@cygnus.com> * inet/getnetgrent.c: Reformat copyright. * inet/getnetgrent_r.c (__internal_endnetgrent): Correct comment. (__internal_getnetgrent): Rename to __internal_getnetgrent_r as required in change nis/nss_compat/* at Thu Dec 19 14:24:50 1996. Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>. * nss/nss_files/files-netgrp.c: Fix typo. * login/utmp_db.c: Comment out unused variables. * misc/tst-dirname.c: Provide prototype for main (for now). * new-malloc/mcheck-init.c: Include <mcheck.h>. * new-malloc/obstack.c: Provide real prototypes. * resolv/base64.c (b64_ntop): Use size_t as type of `i', not int. (b64_pton): Likewise for `tarindex'. * resolv/nsap_addr.c (inet_nsap_addr): Add cast to prevent warning. * stdio-common/Makefile: Add CFLAGS-vfprintf.c to prevent warning. * stdio-common/printf-parse.h: Remove definition of MIN and MAX. * stdio-common/printf-prs.c: Include <sys/param.h> to get MIN and MAX. * stdio-common/vfprintf.c: Likewise. * stdlib/gmp-impl.h: Only define MIN and MAX if not already done. * stdlib/tst-strtol.c: Don't use -2147483648 as unsigned long value. * sysdeps/generic/Makefile ($(subdir)=string): Define CFLAGS-wordcopy.c to prevent warning. * sysdeps/generic/mul_n.c (mpn_mul_n): Don't define as inline. * sysdeps/generic/wordcopy.c: De-ANSI-declfy. * sysdeps/i386/Makefile ($(subdir)=elf): Define CFLAGS-rtld.c to prevent warning. * sysdeps/i386/dl-machine.h: Correct copyright. * sysdeps/unix/closedir.c: Likewise. * sysdeps/unix/dirstream.h: Likewise. * sysdeps/unix/opendir.c: Likewise. * time/tzset.c: Add prototype for __tzset_internal. * sysdeps/gnu/utmpbits.h (enum utlogin): Comment out since the way it is supposed to work is not yet known. (struct utmp): Remove ut_login and ut_syslen field for now. Sat Dec 21 16:23:54 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c: Fix another bug in handling flags made it impossible to use the `-', `_', or `0' flag.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/Makefile1
-rw-r--r--stdio-common/printf-parse.h8
-rw-r--r--stdio-common/printf-prs.c27
-rw-r--r--stdio-common/vfprintf.c1
4 files changed, 16 insertions, 21 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index ec7429c36e..5189dd7eef 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -48,6 +48,7 @@ tests := tst-printf tstscanf test_rdwr test-popen tstgetln test-fseek \
include ../Rules
+CFLAGS-vfprintf.c = -Wno-uninitialized
CFLAGS-_itoa.c = -Wno-unused
CFLAGS-tst-printf.c = -Wno-format
CFLAGS-tstdiomisc.c = -Wno-format
diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h
index 8e3ea0af88..141164b04b 100644
--- a/stdio-common/printf-parse.h
+++ b/stdio-common/printf-parse.h
@@ -25,14 +25,6 @@
#define NDEBUG 1
#include <assert.h>
-#ifndef MAX
-#define MAX(a,b) ({typeof(a) _a = (a); typeof(b) _b = (b); \
- _a > _b ? _a : _b; })
-#endif
-#ifndef MIN
-#define MIN(a,b) ({typeof(a) _a = (a); typeof(b) _b = (b); \
- _a < _b ? _a : _b; })
-#endif
struct printf_spec
{
diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index a15be55c48..4f15373544 100644
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -1,26 +1,27 @@
/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+ 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 Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
-Library General Public License for more details.
+ 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
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include <stdio.h>
#include <printf.h>
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
+#include <sys/param.h>
#ifndef COMPILE_WPRINTF
# define CHAR_T char
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index e2763e4c7d..d24c917bc2 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -24,6 +24,7 @@
#include <errno.h>
#include <wchar.h>
#include <libc-lock.h>
+#include <sys/param.h>
#include "_itoa.h"
#include "../locale/localeinfo.h"