X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.h;h=a28daf68d30144e9c5841a85036fc8cfb021359d;hp=18f6c910cb4d4b4c82d881b34b50dd4deaa3a940;hb=3939d3eae875607c76d7bb3314ff6ca6d0590f40;hpb=5511418f4b6874b99a6b3d57e46aea61c507bd9e

diff --git a/errlog.h b/errlog.h
index 18f6c910..a28daf68 100644
--- a/errlog.h
+++ b/errlog.h
@@ -1,6 +1,6 @@
-#ifndef _ERRLOG_H
-#define _ERRLOG_H
-#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.5 2001/05/26 17:25:14 jongfoster Exp $"
+#ifndef ERRLOG_H_INCLUDED
+#define ERRLOG_H_INCLUDED
+#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.9 2001/07/30 22:08:36 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.h,v $
@@ -35,6 +35,24 @@
  *
  * Revisions   :
  *    $Log: errlog.h,v $
+ *    Revision 1.9  2001/07/30 22:08:36  jongfoster
+ *    Tidying up #defines:
+ *    - All feature #defines are now of the form FEATURE_xxx
+ *    - Permanently turned off WIN_GUI_EDIT
+ *    - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ *    Revision 1.8  2001/07/29 18:43:08  jongfoster
+ *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
+ *    ANSI C rules.
+ *
+ *    Revision 1.7  2001/07/19 19:02:53  haroon
+ *    Added define for LOG_LEVEL_POPUPS
+ *
+ *    Revision 1.6  2001/07/13 13:59:22  oes
+ *     - Added LOG_LEVEL_DEANIMATE
+ *     - Changed LOG_LEVEL_CLF
+ *     - Removed all #ifdef PCRS
+ *
  *    Revision 1.5  2001/05/26 17:25:14  jongfoster
  *    Added support for CLF (Common Log Format) and fixed LOG_LEVEL_LOG
  *
@@ -108,16 +126,21 @@ extern "C" {
 #define LOG_LEVEL_IO         0x0004
 #define LOG_LEVEL_HEADER     0x0008
 #define LOG_LEVEL_LOG        0x0010
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
 #define LOG_LEVEL_FORCE      0x0020
-#endif /* def FORCE_LOAD */
+#endif /* def FEATURE_FORCE_LOAD */
 #define LOG_LEVEL_RE_FILTER  0x0040
-#ifdef FAST_REDIRECTS
+#ifdef FEATURE_FAST_REDIRECTS
 #define LOG_LEVEL_REDIRECTS  0x0080
-#endif /* def FAST_REDIRECTS */
+#endif /* def FEATURE_FAST_REDIRECTS */
 #define LOG_LEVEL_DEANIMATE  0x0100
 
 #define LOG_LEVEL_CLF        0x0200 /* Common Log File format */
+#ifdef FEATURE_KILL_POPUPS
+#define LOG_LEVEL_POPUPS	  0x0400 /* Kill Popups */
+#endif /* def FEATURE_KILL_POPUPS */
+
+#define LOG_LEVEL_CGI   0x0800 /* CGI / templates */
 
 /* Following are always on: */
 #define LOG_LEVEL_INFO    0x1000
@@ -135,7 +158,7 @@ extern const char errlog_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _ERRLOG_H */
+#endif /* ndef ERRLOG_H_INCLUDED */
 
 /*
   Local Variables: