Version 2.9.4 checkin.

[privoxy.git] / loadcfg.h

diff --git a/loadcfg.h b/loadcfg.h
index 941fa41..58ed1bb 100644 (file)
--- a/loadcfg.h
+++ b/loadcfg.h
@@ -1,6 +1,6 @@
 #ifndef _LOADCFG_H
 #define _LOADCFG_H
-#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.1.1.1 2001/05/15 13:58:58 oes Exp $"
+#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.2 2001/05/17 23:01:01 oes Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.h,v $
@@ -37,6 +37,9 @@
  *
  * Revisions   :
  *    $Log: loadcfg.h,v $
+ *    Revision 1.2  2001/05/17 23:01:01  oes
+ *     - Cleaned CRLF's from the sources and related files
+ *
  *    Revision 1.1.1.1  2001/05/15 13:58:58  oes
  *    Initial import of version 2.9.3 source tree
  *
@@ -78,17 +81,13 @@ extern const char *aclfile;
 #endif /* def ACL_FILES */
 
 extern const char *blockfile;
-extern const char *cookiefile;
+extern const char *permissions_file;
 extern const char *forwardfile;
 
 #ifdef USE_IMAGE_LIST
 extern const char *imagefile;
 #endif /* def USE_IMAGE_LIST */
 
-#ifdef KILLPOPUPS
-extern const char *popupfile;
-#endif /* def KILLPOPUPS */
-
 #ifdef TRUST_FILES
 extern const char *trustfile;
 #endif /* def TRUST_FILES */
@@ -97,13 +96,7 @@ extern const char *trustfile;
 extern const char *re_filterfile;
 #endif /* def PCRS */
 
-#ifdef PCRS
-extern int re_filter_all;
-#endif /* def PCRS */
-
-#ifdef KILLPOPUPS
-extern int kill_all_popups;     /* Not recommended really .. */
-#endif /* def KILLPOPUPS */
+extern int default_permissions;\r
 
 #ifdef JAR_FILES
 extern const char *jarfile;
@@ -138,7 +131,7 @@ extern int suppress_blocklists;  /* suppress listing sblock and simage */
 
 extern struct proxy_args proxy_args[1];
 
-extern int configret;
+extern int configret; /* FIXME: This is obsolete, always 0. */
 extern int config_changed;