X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32log.h;h=9f3f6b7969d6813b14d198b9dcf72e88b0e2abb1;hp=c49902739fd1fcfbd9e850c3be3103b718dac597;hb=3939d3eae875607c76d7bb3314ff6ca6d0590f40;hpb=8cdcdc439be755cede31e0c3075e4932eba1ba04;ds=sidebyside

diff --git a/w32log.h b/w32log.h
index c4990273..9f3f6b79 100644
--- a/w32log.h
+++ b/w32log.h
@@ -1,6 +1,6 @@
-#ifndef _W32LOG_H
-#define _W32LOG_H
-#define W32LOG_H_VERSION "$Id: w32log.h,v 1.3 2001/05/29 09:50:24 jongfoster Exp $"
+#ifndef W32LOG_H_INCLUDED
+#define W32LOG_H_INCLUDED
+#define W32LOG_H_VERSION "$Id: w32log.h,v 1.7 2001/07/29 18:43:08 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32log.h,v $
@@ -34,6 +34,19 @@
  *
  * Revisions   :
  *    $Log: w32log.h,v $
+ *    Revision 1.7  2001/07/29 18:43:08  jongfoster
+ *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
+ *    ANSI C rules.
+ *
+ *    Revision 1.6  2001/07/13 14:04:59  oes
+ *    Removed all #ifdef PCRS
+ *
+ *    Revision 1.5  2001/06/07 23:08:12  jongfoster
+ *    Forward and ACL edit options removed.
+ *
+ *    Revision 1.4  2001/05/31 21:37:11  jongfoster
+ *    GUI changes to rename "permissions file" to "actions file".
+ *
  *    Revision 1.3  2001/05/29 09:50:24  jongfoster
  *    Unified blocklist/imagelist/permissionslist.
  *    File format is still under discussion, but the internal changes
@@ -108,20 +121,13 @@ extern int g_nFontSize;
 /* FIXME: this is a kludge */
 
 extern const char * g_actions_file;
-extern const char * g_forwardfile;
-#ifdef ACL_FILES
-extern const char * g_aclfile;
-#endif /* def ACL_FILES */
-#ifdef PCRS
 extern const char * g_re_filterfile;
-#endif
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
 extern const char * g_trustfile;
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
 /* FIXME: end kludge */
 
-
 extern int LogPutString(const char *pszText);
 extern BOOL InitLogWindow(void);
 extern void TermLogWindow(void);
@@ -136,7 +142,7 @@ extern const char w32log_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _W32LOG_H */
+#endif /* ndef W32LOG_H_INCLUDED */
 
 
 /*