From ba9a21b2fa45a29a9e3dff6e0b199d8da5059811 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 23 Jan 2006 14:42:02 +0000 Subject: Get rid of nested warnings --- libc/misc/regex/regcomp.c | 8 ++++---- libc/misc/statfs/fstatvfs.c | 7 +++++++ libc/misc/statfs/fstatvfs64.c | 7 +++++++ libc/misc/statfs/internal_statvfs.c | 9 ++------- libc/misc/statfs/statvfs.c | 7 +++++++ libc/misc/statfs/statvfs64.c | 7 +++++++ libc/signal/sigintr.c | 5 ++++- 7 files changed, 38 insertions(+), 12 deletions(-) (limited to 'libc') diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index 9da0562ff..df7c02181 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -805,6 +805,10 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length, /* Initialize DFA. We use the length of the regular expression PAT_LEN as the initial length of some arrays. */ +#ifdef __UCLIBC_HAS_WCHAR__ +libc_hidden_proto(_stdlib_mb_cur_max) +#endif + static reg_errcode_t init_dfa (re_dfa_t *dfa, size_t pat_len) { @@ -834,10 +838,6 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) dfa->state_hash_mask = table_size - 1; #ifdef __UCLIBC_HAS_WCHAR__ -# undef MB_CUR_MAX -# define MB_CUR_MAX (_stdlib_mb_cur_max ()) -extern size_t _stdlib_mb_cur_max (void) __THROW __wur; -libc_hidden_proto(_stdlib_mb_cur_max) dfa->mb_cur_max = MB_CUR_MAX; #else dfa->mb_cur_max = 1; diff --git a/libc/misc/statfs/fstatvfs.c b/libc/misc/statfs/fstatvfs.c index a8c23992a..c28132022 100644 --- a/libc/misc/statfs/fstatvfs.c +++ b/libc/misc/statfs/fstatvfs.c @@ -27,6 +27,13 @@ #include #include +libc_hidden_proto(memset) +libc_hidden_proto(strcmp) +libc_hidden_proto(strsep) +libc_hidden_proto(setmntent) +libc_hidden_proto(getmntent_r) +libc_hidden_proto(endmntent) + libc_hidden_proto(fstatfs) libc_hidden_proto(fstat) libc_hidden_proto(stat) diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c index 2e25fda2f..13e7b40a7 100644 --- a/libc/misc/statfs/fstatvfs64.c +++ b/libc/misc/statfs/fstatvfs64.c @@ -39,6 +39,13 @@ #include #include +libc_hidden_proto(memset) +libc_hidden_proto(strcmp) +libc_hidden_proto(strsep) +libc_hidden_proto(setmntent) +libc_hidden_proto(getmntent_r) +libc_hidden_proto(endmntent) + #undef stat #define stat stat64 libc_hidden_proto(fstatfs64) diff --git a/libc/misc/statfs/internal_statvfs.c b/libc/misc/statfs/internal_statvfs.c index 2d561976e..27dad0890 100644 --- a/libc/misc/statfs/internal_statvfs.c +++ b/libc/misc/statfs/internal_statvfs.c @@ -17,13 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -libc_hidden_proto(memset) -libc_hidden_proto(strcmp) -libc_hidden_proto(strsep) -libc_hidden_proto(setmntent) -libc_hidden_proto(getmntent_r) -libc_hidden_proto(endmntent) - /* Now fill in the fields we have information for. */ buf->f_bsize = fsbuf.f_bsize; /* Linux does not support f_frsize, so set it to the full block size. */ @@ -90,6 +83,7 @@ libc_hidden_proto(endmntent) buf->f_flag |= ST_RDONLY; else if (strcmp (opt, "nosuid") == 0) buf->f_flag |= ST_NOSUID; +#ifdef _GNU_SOURCE else if (strcmp (opt, "noexec") == 0) buf->f_flag |= ST_NOEXEC; else if (strcmp (opt, "nodev") == 0) @@ -102,6 +96,7 @@ libc_hidden_proto(endmntent) buf->f_flag |= ST_NOATIME; else if (strcmp (opt, "nodiratime") == 0) buf->f_flag |= ST_NODIRATIME; +#endif /* We can stop looking for more entries. */ break; diff --git a/libc/misc/statfs/statvfs.c b/libc/misc/statfs/statvfs.c index 006b791ae..6c3bf7c56 100644 --- a/libc/misc/statfs/statvfs.c +++ b/libc/misc/statfs/statvfs.c @@ -27,6 +27,13 @@ #include #include +libc_hidden_proto(memset) +libc_hidden_proto(strcmp) +libc_hidden_proto(strsep) +libc_hidden_proto(setmntent) +libc_hidden_proto(getmntent_r) +libc_hidden_proto(endmntent) + libc_hidden_proto(statfs) libc_hidden_proto(stat) diff --git a/libc/misc/statfs/statvfs64.c b/libc/misc/statfs/statvfs64.c index eec14983e..1a3dd2833 100644 --- a/libc/misc/statfs/statvfs64.c +++ b/libc/misc/statfs/statvfs64.c @@ -41,6 +41,13 @@ #include #include +libc_hidden_proto(memset) +libc_hidden_proto(strcmp) +libc_hidden_proto(strsep) +libc_hidden_proto(setmntent) +libc_hidden_proto(getmntent_r) +libc_hidden_proto(endmntent) + #undef stat #define stat stat64 libc_hidden_proto(statfs64) diff --git a/libc/signal/sigintr.c b/libc/signal/sigintr.c index 022d185bc..a977e22de 100644 --- a/libc/signal/sigintr.c +++ b/libc/signal/sigintr.c @@ -25,13 +25,16 @@ libc_hidden_proto(sigaction) /* If INTERRUPT is nonzero, make signal SIG interrupt system calls (causing them to fail with EINTR); if INTERRUPT is zero, make system calls be restarted after signal SIG. */ +#ifdef SA_RESTART +extern sigset_t _sigintr attribute_hidden; /* Defined in signal.c. */ +#endif + int siginterrupt (sig, interrupt) int sig; int interrupt; { #ifdef SA_RESTART - extern sigset_t _sigintr attribute_hidden; /* Defined in signal.c. */ struct sigaction action; if (sigaction (sig, (struct sigaction *) NULL, &action) < 0) -- cgit v1.2.3