From e8090680ba09c9741121b628faee62d423abc868 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 29 Mar 2010 10:33:23 -0600 Subject: build: avoid warnings on cygwin * lib/savedir.c (isdir): Avoid shadowing a declaration. * src/main.c (get_nondigit_option): Cast away const to avoid compiler warning. --- lib/savedir.c | 2 +- src/main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/savedir.c b/lib/savedir.c index 53f8c7be..6b2a848c 100644 --- a/lib/savedir.c +++ b/lib/savedir.c @@ -40,7 +40,7 @@ static char *path; static size_t pathlen; -extern int isdir (const char *path); +extern int isdir (const char *name); static int isdir1 (const char *dir, const char *file) diff --git a/src/main.c b/src/main.c index fe4e1014..3fdcfb9b 100644 --- a/src/main.c +++ b/src/main.c @@ -1629,7 +1629,8 @@ get_nondigit_option (int argc, char *const *argv, int *default_context) was_digit = 0; this_digit_optind = optind; - while (opt = getopt_long (argc, argv, short_options, long_options, NULL), + while (opt = getopt_long (argc, (char **) argv, short_options, long_options, + NULL), '0' <= opt && opt <= '9') { if (prev_digit_optind != this_digit_optind || !was_digit) -- cgit v1.2.1