diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-08-17 09:24:39 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:06:54 -0700 |
| commit | a997bf423d4baac5b2286edccd1cef897108397f (patch) | |
| tree | ddea78c3d0fa422aaac324598ef3b5fe75d154bb | |
| parent | d18f76dccff1fc56221846926edb4542d88f60e0 (diff) | |
| download | git-a997bf423d4baac5b2286edccd1cef897108397f.tar.gz git-a997bf423d4baac5b2286edccd1cef897108397f.tar.xz | |
compat/regex: get the gawk regex engine to compile within git
We need to define -DGAWK -DNO_MBSUPPORT so that the gawk regex engine
will compile, and include stdio.h and stddef.h in regex.h. Gawk itself
includes these headers before it includes the regex.h header.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | compat/regex/regex.h | 3 |
2 files changed, 7 insertions, 0 deletions
@@ -1878,6 +1878,10 @@ ifdef NO_EXPAT http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT endif +ifdef NO_REGEX +compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT +endif + git-%$X: %.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) diff --git a/compat/regex/regex.h b/compat/regex/regex.h index de9332788..61c968387 100644 --- a/compat/regex/regex.h +++ b/compat/regex/regex.h @@ -1,3 +1,6 @@ +#include <stdio.h> +#include <stddef.h> + /* Definitions for data structures and routines for the regular expression library. Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008 |