diff options
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/Makefile | 1 | ||||
| -rw-r--r-- | stdio-common/printf-parse.h | 8 | ||||
| -rw-r--r-- | stdio-common/printf-prs.c | 27 | ||||
| -rw-r--r-- | stdio-common/vfprintf.c | 1 |
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" |