From: David Schmidt <david__schmidt@users.sourceforge.net>
Date: Thu, 25 Oct 2001 03:45:02 +0000 (+0000)
Subject: Adding a (void*) cast to freez() because Visual Age C++ won't expand the
X-Git-Tag: v_2_9_10~76
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=e026277712b5a1e2fda4722bb4af111e64d4a823

Adding a (void*) cast to freez() because Visual Age C++ won't expand the
macro when called with a cast; so moving the cast to the macro def'n
seems to both eliminate compiler warnings (on darwin and OS/2, anyway) and
doesn't make macro expansion complain.  Hope this works for everyone else
too...
---

diff --git a/project.h b/project.h
index 2b2c6257..472222d4 100644
--- a/project.h
+++ b/project.h
@@ -1,6 +1,6 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
-#define PROJECT_H_VERSION "$Id: project.h,v 1.37 2001/10/14 22:14:01 jongfoster Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.38 2001/10/23 21:19:04 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
@@ -13,10 +13,10 @@
  *                IJBSWA team.  http://ijbswa.sourceforge.net
  *
  *                Based on the Internet Junkbuster originally written
- *                by and Copyright (C) 1997 Anonymous Coders and 
+ *                by and Copyright (C) 1997 Anonymous Coders and
  *                Junkbusters Corporation.  http://www.junkbusters.com
  *
- *                This program is free software; you can redistribute it 
+ *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *                Public License as published by the Free Software
  *                Foundation; either version 2 of the License, or (at
@@ -36,6 +36,12 @@
  *
  * Revisions   :
  *    $Log: project.h,v $
+ *    Revision 1.38  2001/10/23 21:19:04  jongfoster
+ *    New error-handling support: jb_err type and JB_ERR_xxx constants
+ *    CGI functions now return a jb_err, and their parameters map is const.
+ *    Support for RUNTIME_FEATUREs to enable/disable config editor
+ *    Adding a few comments
+ *
  *    Revision 1.37  2001/10/14 22:14:01  jongfoster
  *    Removing name_length field from struct cgi_dispatcher, as this is
  *    now calculated at runtime from the "name" field.
@@ -314,9 +320,9 @@
 #endif
 
 #ifdef STATIC_PCRS
-#  include "pcrs.h" 
+#  include "pcrs.h"
 #else
-#  include <pcrs.h> 
+#  include <pcrs.h>
 #endif
 
 #if defined(REGEX_PCRE)
@@ -331,8 +337,8 @@
 #  include "gnu_regex.h"
 #endif
 
-#ifdef AMIGA 
-#include "amiga.h" 
+#ifdef AMIGA
+#include "amiga.h"
 #endif /* def AMIGA */
 
 #ifdef __cplusplus
@@ -356,7 +362,7 @@ typedef int jb_err;
 /*
  * This macro is used to free a pointer that may be NULL
  */
-#define freez(X)  { if(X) { free(X); X = NULL ; } }
+#define freez(X)  { if(X) { free((void*)X); X = NULL ; } }
 
 /*
  * Use for statically allocated buffers if you have no other choice.
@@ -602,7 +608,7 @@ struct url_actions
 /*
  * *If* this is MSIE, it wants an image.  (Or this is a shift-reload, or
  * it's got an image from this URL before...  yuck!)
- * Only meaningful if ACCEPT_TYPE_IS_MSIE set 
+ * Only meaningful if ACCEPT_TYPE_IS_MSIE set
  */
 #define ACCEPT_TYPE_MSIE_IMAGE  0x0002
 
@@ -697,7 +703,7 @@ struct client_state
    struct file_list *actions_list;
 
    struct file_list *rlist;   /* pcrs job file */
-   size_t content_length;     /* Length after content modification */ 
+   size_t content_length;     /* Length after content modification */
 
 #ifdef FEATURE_TRUST
    struct file_list *tlist;   /* trustfile */
@@ -739,11 +745,11 @@ struct file_list
     * Read-only once the structure has been created.
     */
    void *f;
-   
+
    /* Normally NULL.  When we are finished with file (i.e. when we have
     * loaded a new one), set to a pointer to an unloader function.
     * Unloader will be called by sweep() (called from main loop) when
-    * all clients using this file are done.  This prevents threading 
+    * all clients using this file are done.  This prevents threading
     * problems.
     */
    void (*unloader)(void *);