mirror/grep
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/grep.git synced 2026-01-26 15:39:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: allow compilation on cygwin

Browse Source 
Gnulib is incompatible with -Wunused-macros.  Addtionally,
cygwin 1.7.1 coupled with --enable-gcc-warnings tripped on:

grep.c: In function 'print_line_middle':
grep.c:805: error: array subscript has type 'char' [-Wchar-subscripts]
grep.c: In function 'main':
grep.c:1833: error: 'optarg' redeclared without dllimport attribute: previous dllimport ignored [-Wattributes]
grep.c:1834: error: 'optind' redeclared without dllimport attribute after being referenced with dll linkage

* configure.ac (GNULIB_WARN_FLAGS): Disable -Wunused-macros.
* src/grep.c (print_line_middle): Use correct type to tolower.
(main): Drop useless redeclarations.
* .gitignore: Ignore more built files.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2010-03-19 10:34:25 -06:00
parent 159c02545b
commit 07505db6b9
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,8 +1,10 @@
!/gnulib-tests/Makefile.am
!/lib/Makefile.am
!/lib/savedir.c
!/lib/savedir.h
!/m4/djgpp.m4
*.a
*.exe
*.o
*~
.deps
@ -19,6 +21,7 @@
/config.status
/configure
/configure.ac
/gnulib-tests/*
/lib/*
/lib/charset.alias
/lib/configmake.h

2
configure.ac
View File

@ -130,7 +130,7 @@ if test "$gl_gcc_warnings" = yes; then
# Remove the following and save the result in GNULIB_WARN_CFLAGS.
nw=
#nw="$nw -Wuninitialized"
#nw="$nw -Wunused-macros"
nw="$nw -Wunused-macros"
#nw="$nw -Wmissing-prototypes"
nw="$nw -Wold-style-definition"
gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw])

4
src/grep.c
View File

@ -802,7 +802,7 @@ print_line_middle (const char *beg, const char *lim,
/* This can't possibly be correct with UTF-8,
but it's equivalent to what was there so far. */
while (--i >= 0)
buf[i] = tolower(beg[i]);
buf[i] = tolower((unsigned char) beg[i]);
}
else
{
@ -1830,8 +1830,6 @@ main (int argc, char **argv)
int opt, cc, status;
int default_context;
FILE *fp;
extern char *optarg;
extern int optind;
initialize_main (&argc, &argv);
set_program_name (argv[0]);