X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=ca8ea3af8f6ae7b1d9844ac8c8adb200051cb672;hp=e95028480fccf21e5ec7e5ac56e0941375f08434;hb=79756f0bb8bd9108538cf93914f486506de8141f;hpb=c9bedeeb530fb2011569a42752b40f4742754520 diff --git a/project.h b/project.h index e9502848..ca8ea3af 100644 --- a/project.h +++ b/project.h @@ -1,6 +1,6 @@ #ifndef PROJECT_H_INCLUDED #define PROJECT_H_INCLUDED -#define PROJECT_H_VERSION "$Id: project.h,v 1.63 2002/03/31 17:19:00 jongfoster Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.64 2002/04/03 22:28:03 gliptak Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -36,6 +36,9 @@ * * Revisions : * $Log: project.h,v $ + * Revision 1.64 2002/04/03 22:28:03 gliptak + * Removed references to gnu_regex + * * Revision 1.63 2002/03/31 17:19:00 jongfoster * Win32 only: Enabling STRICT to fix a VC++ compile warning. * @@ -423,10 +426,6 @@ * and are included anyway. */ -#if defined(REGEX_PCRE) -# define REGEX -#endif /* defined(REGEX_PCRE) */ - #ifdef STATIC_PCRE # include "pcre.h" #else @@ -439,13 +438,11 @@ # include #endif -#if defined(REGEX_PCRE) -# ifdef STATIC_PCRE -# include "pcreposix.h" -# else -# include -# endif -#endif /* defined(REGEX_PCRE) */ +#ifdef STATIC_PCRE +# include "pcreposix.h" +#else +# include +#endif #ifdef AMIGA #include "amiga.h" @@ -632,15 +629,9 @@ struct url_spec char *path; /* The path prefix (if not using regex), or source */ /* for the regex. */ int pathlen; /* ==strlen(path). Needed for prefix matching. */ -#ifdef REGEX regex_t *preg; /* Regex for matching path part */ -#endif }; -#ifdef REGEX #define URL_SPEC_INITIALIZER { NULL, NULL, NULL, 0, 0, 0, NULL, 0, NULL } -#else /* ifndef REGEX */ -#define URL_SPEC_INITIALIZER { NULL, NULL, NULL, 0, 0, 0, NULL, 0 } -#endif /* ndef REGEX */ /* Constants for host part matching in URLs */ #define ANCHOR_LEFT 1