From: jongfoster Date: Sun, 29 Jul 2001 18:58:15 +0000 (+0000) Subject: Removing nested #includes, adding forward declarations for needed X-Git-Tag: v_2_9_9~186 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=0ad5ceedec2b1049cff13e8cab789733d373267e Removing nested #includes, adding forward declarations for needed structures, and changing the #define _FILENAME_H to FILENAME_H_INCLUDED. --- diff --git a/gateway.h b/gateway.h index 5f1eb826..278f70e0 100644 --- a/gateway.h +++ b/gateway.h @@ -1,6 +1,6 @@ -#ifndef _GATEWAY_H -#define _GATEWAY_H -#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.1.1.1 2001/05/15 13:58:54 oes Exp $" +#ifndef GATEWAY_H_INCLUDED +#define GATEWAY_H_INCLUDED +#define GATEWAY_H_VERSION "$Id: gateway.h,v 1.2 2001/06/07 23:12:14 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/gateway.h,v $ @@ -36,6 +36,14 @@ * * Revisions : * $Log: gateway.h,v $ + * Revision 1.2 2001/06/07 23:12:14 jongfoster + * Removing gateways[] list - no longer used. + * Replacing function pointer in struct gateway with a directly + * called function forwarded_connect(), which can do the common + * task of deciding whether to connect to the web server or HTTP + * proxy. + * Replacing struct gateway with struct forward_spec + * * Revision 1.1.1.1 2001/05/15 13:58:54 oes * Initial import of version 2.9.3 source tree * @@ -43,12 +51,14 @@ *********************************************************************/ -#include "project.h" - #ifdef __cplusplus extern "C" { #endif +struct forward_spec; +struct http_request; +struct client_state; + extern int forwarded_connect(const struct forward_spec * fwd, struct http_request *http, struct client_state *csp); @@ -61,7 +71,7 @@ extern const char gateway_h_rcs[]; } /* extern "C" */ #endif -#endif /* ndef _GATEWAY_H */ +#endif /* ndef GATEWAY_H_INCLUDED */ /* Local Variables: diff --git a/jcc.h b/jcc.h index f2560d33..202aa58e 100644 --- a/jcc.h +++ b/jcc.h @@ -1,6 +1,6 @@ -#ifndef _JCC_H -#define _JCC_H -#define JCC_H_VERSION "$Id: jcc.h,v 1.2 2001/05/31 21:24:47 jongfoster Exp $" +#ifndef JCC_H_INCLUDED +#define JCC_H_INCLUDED +#define JCC_H_VERSION "$Id: jcc.h,v 1.3 2001/07/18 12:31:58 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/jcc.h,v $ @@ -35,6 +35,9 @@ * * Revisions : * $Log: jcc.h,v $ + * Revision 1.3 2001/07/18 12:31:58 oes + * moved #define freez from jcc.h to project.h + * * Revision 1.2 2001/05/31 21:24:47 jongfoster * Changed "permission" to "action" throughout. * Removed DEFAULT_USER_AGENT - it must now be specified manually. @@ -48,18 +51,14 @@ *********************************************************************/ -/* Declare struct FILE for vars and funcs. */ -#include - -/* All of our project's data types. */ -#include "project.h" - -#include "loadcfg.h" - #ifdef __cplusplus extern "C" { #endif +struct client_state; +struct file_list; + + /* Global variables */ #ifdef STATISTICS @@ -88,7 +87,7 @@ extern const char jcc_h_rcs[]; } /* extern "C" */ #endif -#endif /* ndef _JCC_H */ +#endif /* ndef JCC_H_INCLUDED */ /* Local Variables: diff --git a/loadcfg.h b/loadcfg.h index ea13f483..f84eada4 100644 --- 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.4 2001/05/22 18:46:04 oes Exp $" +#ifndef LOADCFG_H_INCLUDED +#define LOADCFG_H_INCLUDED +#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.5 2001/05/26 00:28:36 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.h,v $ @@ -37,6 +37,13 @@ * * Revisions : * $Log: loadcfg.h,v $ + * Revision 1.5 2001/05/26 00:28:36 jongfoster + * Automatic reloading of config file. + * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). + * Most of the global variables have been moved to a new + * struct configuration_spec, accessed through csp->config->globalname + * Most of the globals remaining are used by the Win32 GUI. + * * Revision 1.4 2001/05/22 18:46:04 oes * * - Enabled filtering banners by size rather than URL @@ -104,16 +111,13 @@ *********************************************************************/ -/* Declare struct FILE for vars and funcs. */ -#include - -/* All of our project's data types. */ -#include "project.h" - #ifdef __cplusplus extern "C" { #endif +/* Don't need project.h, only this: */ +struct configuration_spec; + /* Global variables */ #ifdef TOGGLE @@ -144,7 +148,7 @@ extern const char loadcfg_h_rcs[]; } /* extern "C" */ #endif -#endif /* ndef _JCC_H */ +#endif /* ndef LOADCFG_H_INCLUDED */ /* Local Variables: diff --git a/loaders.h b/loaders.h index 2ebb564a..a794b22f 100644 --- a/loaders.h +++ b/loaders.h @@ -1,6 +1,6 @@ -#ifndef _LOADERS_H -#define _LOADERS_H -#define LOADERS_H_VERSION "$Id: loaders.h,v 1.6 2001/06/07 23:14:38 jongfoster Exp $" +#ifndef LOADERS_H_INCLUDED +#define LOADERS_H_INCLUDED +#define LOADERS_H_VERSION "$Id: loaders.h,v 1.7 2001/07/13 14:01:54 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.h,v $ @@ -37,6 +37,9 @@ * * Revisions : * $Log: loaders.h,v $ + * Revision 1.7 2001/07/13 14:01:54 oes + * Removed all #ifdef PCRS + * * Revision 1.6 2001/06/07 23:14:38 jongfoster * Removing ACL and forward file loaders - these files have * been merged into the config file. @@ -95,12 +98,16 @@ *********************************************************************/ -#include "project.h" - #ifdef __cplusplus extern "C" { #endif +/* Structures taken from project.h */ +struct client_state; +struct file_list; +struct configuration_spec; +struct url_spec; + extern void sweep(void); extern char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs); extern int check_file_changed(const struct file_list * current, @@ -131,7 +138,7 @@ extern const char loaders_h_rcs[]; } /* extern "C" */ #endif -#endif /* ndef _LOADERS_H */ +#endif /* ndef LOADERS_H_INCLUDED */ /* Local Variables: