diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2006-03-02 16:41:04 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2006-03-02 16:41:04 +0000 |
| commit | 7725acc03153c5bfbe26681d1585b8b6600892ae (patch) | |
| tree | b78fc68bfc275c44da9c0ea8ba17e32ca36f6b3a | |
| parent | 4d7a32f455e0aa86bf1d140fb7f40be1d9b25c21 (diff) | |
Remove CFLAGS-OMIT support, rename getline to get testregex compile w/ -D_GNU_SOURCE
| -rw-r--r-- | test/Test.mak | 4 | ||||
| -rw-r--r-- | test/regex/Makefile | 9 | ||||
| -rw-r--r-- | test/regex/testregex.c | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/test/Test.mak b/test/Test.mak index 6776f8d8e..981468c2e 100644 --- a/test/Test.mak +++ b/test/Test.mak @@ -73,7 +73,7 @@ endef $(U_TARGETS): $(showlink) - $(Q)$(CC) $(filter-out $(CFLAGS-OMIT_$@),$(CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c $@.c -o $@.o + $(Q)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c $@.c -o $@.o $(Q)$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$@) ifeq ($(COMPILE_ONLY),) $(exec_test) @@ -82,7 +82,7 @@ endif $(G_TARGETS): $(showlink) - $(Q)$(HOSTCC) $(filter-out $(CFLAGS-OMIT_$(patsubst %_glibc,%,$@)),$(HOST_CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o + $(Q)$(HOSTCC) $(HOST_CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o $(Q)$(HOSTCC) $(HOST_LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@)) ifeq ($(COMPILE_ONLY),) $(exec_test) diff --git a/test/regex/Makefile b/test/regex/Makefile index ca199bcbb..62a3a6e91 100644 --- a/test/regex/Makefile +++ b/test/regex/Makefile @@ -7,15 +7,6 @@ include ../Test.mak CFLAGS_tst-regex2 := -std=c99 -CFLAGS-OMIT_testregex := -D_GNU_SOURCE -CFLAGS-OMIT_testregexc := -D_GNU_SOURCE -CFLAGS-OMIT_testregexf := -D_GNU_SOURCE -CFLAGS-OMIT_testregexi := -D_GNU_SOURCE -CFLAGS-OMIT_testregexl := -D_GNU_SOURCE -CFLAGS-OMIT_testregexn := -D_GNU_SOURCE -CFLAGS-OMIT_testregexp := -D_GNU_SOURCE -CFLAGS-OMIT_testregexr := -D_GNU_SOURCE - OPTS_testregex := < basic.dat OPTS_testregexc := < categorize.dat OPTS_testregexf := < forcedassoc.dat diff --git a/test/regex/testregex.c b/test/regex/testregex.c index 7b86ab79e..3d953f5d3 100644 --- a/test/regex/testregex.c +++ b/test/regex/testregex.c @@ -985,7 +985,7 @@ gotcha(int sig) } static char* -getline(FILE* fp) +my_getline(FILE* fp) { static char buf[32 * 1024]; @@ -1343,7 +1343,7 @@ main(int argc, char** argv) signal(SIGBUS, gotcha); signal(SIGSEGV, gotcha); } - while (p = getline(fp)) + while (p = my_getline(fp)) { /* parse: */ |