X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=project.h;h=2f14079cb4e369b514885865d6fc0950b1c9513c;hb=4bb8225677e05ca9fe842f6343479fd4f875a022;hp=92ee41ce47d0f4ffb05d17b1b526a8e5787b8f2d;hpb=25fa58f84190ecef8f921613e7c681a56a1f5f57;p=privoxy.git diff --git a/project.h b/project.h index 92ee41ce..2f14079c 100644 --- a/project.h +++ b/project.h @@ -1,6 +1,6 @@ #ifndef _PROJECT_H #define _PROJECT_H -#define PROJECT_H_VERSION "$Id: project.h,v 1.20 2001/06/29 21:45:41 oes Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.22 2001/07/15 17:51:41 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -36,6 +36,16 @@ * * Revisions : * $Log: project.h,v $ + * Revision 1.22 2001/07/15 17:51:41 jongfoster + * Renaming #define STATIC to STATIC_PCRE + * + * Revision 1.21 2001/07/13 14:03:19 oes + * - Reorganized regex header inclusion and #defines to + * comply to the scheme in configure.in + * - Added csp->content_type and its CT_* keys + * - Added ACTION_DEANIMATE + * - Removed all #ifdef PCRS + * * Revision 1.20 2001/06/29 21:45:41 oes * Indentation, CRLF->LF, Tab-> Space * @@ -224,7 +234,7 @@ # define REGEX #endif /* defined(REGEX_PCRE) || defined (REGEX_GNU) */ -#ifdef STATIC +#ifdef STATIC_PCRE # include "pcre.h" #else # include @@ -237,7 +247,7 @@ #endif #if defined(REGEX_PCRE) -# ifdef STATIC +# ifdef STATIC_PCRE # include "pcreposix.h" # else # include @@ -256,6 +266,8 @@ extern "C" { #endif +#define freez(X) if(X) free(X); X = NULL + #define BUFFER_SIZE 5000 #define FOREVER 1 @@ -373,11 +385,13 @@ struct iob #define ACTION_NO_POPUPS 0x0800U #define ACTION_VANILLA_WAFER 0x1000U -#define ACTION_STRING_FROM 0 -#define ACTION_STRING_IMAGE_BLOCKER 1 -#define ACTION_STRING_REFERER 2 -#define ACTION_STRING_USER_AGENT 3 -#define ACTION_STRING_COUNT 4 +#define ACTION_STRING_DEANIMATE 0 +#define ACTION_STRING_FROM 1 +#define ACTION_STRING_IMAGE_BLOCKER 2 +#define ACTION_STRING_REFERER 3 +#define ACTION_STRING_USER_AGENT 4 +#define ACTION_STRING_COUNT 5 + #define ACTION_MULTI_ADD_HEADER 0 #define ACTION_MULTI_WAFER 1