From: jongfoster <jongfoster@users.sourceforge.net>
Date: Sun, 29 Jul 2001 18:59:21 +0000 (+0000)
Subject: - Changing #define _KILLPOPUP_H to KILLPOPUP_H_INCLUDED
X-Git-Tag: v_2_9_9~185
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=c579af14ac362b08c67bef547c66587f98612a8f

- Changing #define _KILLPOPUP_H to KILLPOPUP_H_INCLUDED
- Adding extern "C" {}
---

diff --git a/killpopup.h b/killpopup.h
index 23bd7d7b..7e3fb879 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.2 2001/05/20 01:21:20 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/killpopup.h,v $
@@ -34,6 +34,19 @@
  *
  * Revisions   :
  *    $Log: killpopup.h,v $
+ *    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,6 +56,10 @@
 
 #include "project.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef KILLPOPUPS
 
 extern void filter_popups(char *buff, int size);
@@ -53,7 +70,11 @@ extern void filter_popups(char *buff, int size);
 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: