Skip to content

Commit cd1547d

Browse files
committed
Merge branch 'ab/compat-regex'
* ab/compat-regex: Fix compat/regex ANSIfication on MinGW autoconf: regex library detection typofix autoconf: don't use platform regex if it lacks REG_STARTEND t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND compat/regex: get rid of old-style definition compat/regex: define out variables only used under RE_ENABLE_I18N Change regerror() declaration from K&R style to ANSI C (C89) compat/regex: get the gawk regex engine to compile within git compat/regex: use the regex engine from gawk for compat Conflicts: compat/regex/regex.c
2 parents c6babe5 + ce518bb commit cd1547d

File tree

10 files changed

+11194
-5106
lines changed

10 files changed

+11194
-5106
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,6 +1900,10 @@ ifdef NO_EXPAT
19001900
http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
19011901
endif
19021902

1903+
ifdef NO_REGEX
1904+
compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT
1905+
endif
1906+
19031907
git-%$X: %.o $(GITLIBS)
19041908
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
19051909

0 commit comments

Comments
 (0)