diff options
| author | Robert James Kaes <rjkaes@users.sourceforge.net> | 2003-08-07 16:32:12 +0000 |
|---|---|---|
| committer | Robert James Kaes <rjkaes@users.sourceforge.net> | 2003-08-07 16:32:12 +0000 |
| commit | d2098f638fe218ec5e9f1cd2f4b112bc94c8f438 (patch) | |
| tree | 05273f3790a858f613562e73a55612e48707b295 /src | |
| parent | d72fa83245b85553db42e69786fd02035d0116f6 (diff) | |
| download | tinyproxy-d2098f638fe218ec5e9f1cd2f4b112bc94c8f438.tar.gz tinyproxy-d2098f638fe218ec5e9f1cd2f4b112bc94c8f438.zip | |
tinyproxy no longer includes a fall-back regular expression library,
so these files needed to be modified to only use the system's
installed regular expression library.
Diffstat (limited to '')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/common.h | 5 | ||||
| -rw-r--r-- | src/filter.c | 3 | ||||
| -rw-r--r-- | src/reqs.c | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4a9c42f..a45e6c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.17 2003-06-26 18:23:01 rjkaes Exp $ +# $Id: Makefile.am,v 1.18 2003-08-07 16:32:12 rjkaes Exp $ # # Copyright (C) 2000 Robert James Kaes (rjkaes@flarenet.com) # @@ -39,10 +39,8 @@ tinyproxy_SOURCES = \ tinyproxy.c tinyproxy.h \ utils.c utils.h \ vector.c vector.h \ - grammar.y scanner.l \ - regexp.h + grammar.y scanner.l -EXTRA_DIST = gnuregex.c gnuregex.h EXTRA_tinyproxy_SOURCES = filter.c filter.h grammar.h tinyproxy_DEPENDENCIES = @ADDITIONAL_OBJECTS@ tinyproxy_LDADD = @ADDITIONAL_OBJECTS@ diff --git a/src/common.h b/src/common.h index 0982189..eaf00f9 100644 --- a/src/common.h +++ b/src/common.h @@ -1,4 +1,4 @@ -/* $Id: common.h,v 1.6 2003-06-25 18:20:22 rjkaes Exp $ +/* $Id: common.h,v 1.7 2003-08-07 16:32:12 rjkaes Exp $ * * This file groups all the headers required throughout the tinyproxy * system. All this information use to be in the "tinyproxy.h" header, @@ -111,6 +111,9 @@ #ifdef HAVE_PWD_H # include <pwd.h> #endif +#ifdef HAVE_REGEX_H +# include <regex.h> +#endif #ifdef HAVE_SIGNAL_H # include <signal.h> #endif diff --git a/src/filter.c b/src/filter.c index 8684992..34dad75 100644 --- a/src/filter.c +++ b/src/filter.c @@ -1,4 +1,4 @@ -/* $Id: filter.c,v 1.17 2003-07-31 23:38:28 rjkaes Exp $ +/* $Id: filter.c,v 1.18 2003-08-07 16:32:12 rjkaes Exp $ * * Copyright (c) 1999 George Talusan (gstalusan@uwaterloo.ca) * Copyright (c) 2002 James E. Flemer (jflemer@acm.jhu.edu) @@ -23,7 +23,6 @@ #include "filter.h" #include "heap.h" #include "log.h" -#include "regexp.h" #include "reqs.h" #define FILTER_BUFFER_LEN (512) @@ -1,4 +1,4 @@ -/* $Id: reqs.c,v 1.107 2003-08-05 16:11:59 rjkaes Exp $ +/* $Id: reqs.c,v 1.108 2003-08-07 16:32:12 rjkaes Exp $ * * This is where all the work in tinyproxy is actually done. Incoming * connections have a new child created for them. The child then @@ -33,7 +33,6 @@ #include "htmlerror.h" #include "log.h" #include "network.h" -#include "regexp.h" #include "reqs.h" #include "sock.h" #include "stats.h" |