X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=killpopup.h;h=07ff1a75b657bb615d7b7c891c3c34f21b30ea5d;hp=23bd7d7bad91599b7da458d0d192245d1cad7bb6;hb=7e5776d39d3c2dc3f1f341c96bbf8a6948de5682;hpb=87a69fc505def6be1c8a4d24ae225c3623b5e861

diff --git a/killpopup.h b/killpopup.h
index 23bd7d7b..07ff1a75 100644
--- a/killpopup.h
+++ b/killpopup.h
@@ -1,6 +1,6 @@
-#ifndef _KILLPOPUP_H
-#define _KILLPOPUP_H
-#define KILLPOPUP_H_VERSION "$Id: killpopup.h,v 1.1.1.1 2001/05/15 13:58:58 oes Exp $"
+#ifndef KILLPOPUP_H_INCLUDED
+#define KILLPOPUP_H_INCLUDED
+#define KILLPOPUP_H_VERSION "$Id: killpopup.h,v 1.4 2001/07/30 22:08:36 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/killpopup.h,v $
@@ -34,6 +34,29 @@
  *
  * Revisions   :
  *    $Log: killpopup.h,v $
+ *    Revision 1.4  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.3  2001/07/29 18:59:21  jongfoster
+ *    - Changing #define _KILLPOPUP_H to KILLPOPUP_H_INCLUDED
+ *    - Adding extern "C" {}
+ *
+ *    Revision 1.2  2001/05/20 01:21:20  jongfoster
+ *    Version 2.9.4 checkin.
+ *    - Merged popupfile and cookiefile, and added control over PCRS
+ *      filtering, in new "permissionsfile".
+ *    - Implemented LOG_LEVEL_FATAL, so that if there is a configuration
+ *      file error you now get a message box (in the Win32 GUI) rather
+ *      than the program exiting with no explanation.
+ *    - Made killpopup use the PCRS MIME-type checking and HTTP-header
+ *      skipping.
+ *    - Removed tabs from "config"
+ *    - Moved duplicated url parsing code in "loaders.c" to a new funcition.
+ *    - Bumped up version number.
+ *
  *    Revision 1.1.1.1  2001/05/15 13:58:58  oes
  *    Initial import of version 2.9.3 source tree
  *
@@ -43,17 +66,25 @@
 
 #include "project.h"
 
-#ifdef KILLPOPUPS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-extern void filter_popups(char *buff, int size);
+#ifdef FEATURE_KILL_POPUPS
 
-#endif /* def KILLPOPUPS */
+extern void filter_popups(char *buff);
+
+#endif /* def FEATURE_KILL_POPUPS */
 
 /* Revision control strings from this header and associated .c file */
 extern const char killpopup_rcs[];
 extern const char killpopup_h_rcs[];
 
-#endif /* ndef _KILLPOPUP_H */
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* ndef KILLPOPUP_H_INCLUDED */
 
 /*
   Local Variables: