grep branch, master, updated. v2.6.1-31-ge809068

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  e8090680ba09c9741121b628faee62d423abc868 (commit)
       via  74902d9375129575a36731c7407d2a453286a1c7 (commit)
      from  a3b22841d8478f985149c001033423fa3a3f94ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=e8090680ba09c9741121b628faee62d423abc868


commit e8090680ba09c9741121b628faee62d423abc868
Author: Eric Blake <address@hidden>
Date:   Mon Mar 29 10:33:23 2010 -0600

    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.

diff --git a/lib/savedir.c b/lib/savedir.c
index 53f8c7b..6b2a848 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 fe4e101..3fdcfb9 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)

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=74902d9375129575a36731c7407d2a453286a1c7


commit e8090680ba09c9741121b628faee62d423abc868
Author: Eric Blake <address@hidden>
Date:   Mon Mar 29 10:33:23 2010 -0600

    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.

diff --git a/lib/savedir.c b/lib/savedir.c
index 53f8c7b..6b2a848 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 fe4e101..3fdcfb9 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)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore    |    1 +
 lib/savedir.c |    2 +-
 src/main.c    |    3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep