diff options
author | Eric Blake <eblake@redhat.com> | 2010-03-29 10:33:23 -0600 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2010-03-29 11:31:59 -0600 |
commit | e8090680ba09c9741121b628faee62d423abc868 (patch) | |
tree | a9e08cad45692fe329967cf7676f07fa9f283894 | |
parent | 74902d9375129575a36731c7407d2a453286a1c7 (diff) | |
download | grep-e8090680ba09c9741121b628faee62d423abc868.tar.gz |
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.
-rw-r--r-- | lib/savedir.c | 2 | ||||
-rw-r--r-- | 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) @@ -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) |