X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.h;h=5c7e2f007605b7c594930c5532836799198a99bf;hp=f84eada45786a08f8c2f7cc0438001aa2fae99f4;hb=6c8cb91529d62ec437a3970c090e67c240659bc0;hpb=0ad5ceedec2b1049cff13e8cab789733d373267e diff --git a/loadcfg.h b/loadcfg.h index f84eada4..5c7e2f00 100644 --- a/loadcfg.h +++ b/loadcfg.h @@ -1,6 +1,6 @@ #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 $" +#define LOADCFG_H_VERSION "$Id: loadcfg.h,v 1.7 2001/07/30 22:08:36 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.h,v $ @@ -37,6 +37,16 @@ * * Revisions : * $Log: loadcfg.h,v $ + * Revision 1.7 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.6 2001/07/29 18:58:15 jongfoster + * Removing nested #includes, adding forward declarations for needed + * structures, and changing the #define _FILENAME_H to FILENAME_H_INCLUDED. + * * 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). @@ -120,10 +130,10 @@ struct configuration_spec; /* Global variables */ -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE /* indicates if ijb is enabled */ extern int g_bToggleIJB; -#endif +#endif /* def FEATURE_TOGGLE */ extern const char *configfile; @@ -135,6 +145,7 @@ extern const char *configfile; */ extern int Argc; extern const char **Argv; +extern short int MustReload; extern struct configuration_spec * load_config(void);