X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=project.h;h=ca8ea3af8f6ae7b1d9844ac8c8adb200051cb672;hp=4d1bebd083150d2017413f67999021dd0c6ede2f;hb=3186134c92fc0a088001a89d17abd5b3486baf2f;hpb=eba2b5b8a51cc261302e46e69f1837f34d99326b diff --git a/project.h b/project.h index 4d1bebd0..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.59 2002/03/24 15:23:33 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 $ @@ -10,7 +10,7 @@ * (though it does declare some macros). * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,21 @@ * * 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. + * + * Revision 1.62 2002/03/26 22:48:49 swa + * new homepage url + * + * Revision 1.61 2002/03/26 22:29:55 swa + * we have a new homepage! + * + * Revision 1.60 2002/03/24 15:52:17 jongfoster + * Changing CGI URL prefixes for new name + * * Revision 1.59 2002/03/24 15:23:33 jongfoster * Name changes * @@ -411,10 +426,6 @@ * and are included anyway. */ -#if defined(REGEX_PCRE) || defined (REGEX_GNU) -# define REGEX -#endif /* defined(REGEX_PCRE) || defined (REGEX_GNU) */ - #ifdef STATIC_PCRE # include "pcre.h" #else @@ -427,16 +438,10 @@ # include #endif -#if defined(REGEX_PCRE) -# ifdef STATIC_PCRE -# include "pcreposix.h" -# else -# include -# endif -#endif /* defined(REGEX_PCRE) */ - -#if defined(REGEX_GNU) -# include "gnu_regex.h" +#ifdef STATIC_PCRE +# include "pcreposix.h" +#else +# include #endif #ifdef AMIGA @@ -448,6 +453,9 @@ * I don't want to have to #include all this just for the declaration * of SOCKET. However, it looks like we have to... */ +#ifndef STRICT +#define STRICT +#endif #include #endif @@ -621,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 @@ -1064,7 +1066,7 @@ struct configuration_spec /* Hardwired URLs */ -#define HOME_PAGE_URL "http://ijbswa.sourceforge.net" +#define HOME_PAGE_URL "http://www.privoxy.org" #define REDIRECT_URL HOME_PAGE_URL "/redirect.php?v=" VERSION "&to=" /*