X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32log.h;h=9ad6a20703f4bb212f65d5ca7bdf95218a831aee;hp=3c40c4817b6febdfe65363fd9e3c85a048019006;hb=8a5751cc96dd085fcbcc34bef77499306bddc0c0;hpb=362f5979d9efa6e7c1c38c1b75e41e91c710772b

diff --git a/w32log.h b/w32log.h
index 3c40c481..9ad6a207 100644
--- a/w32log.h
+++ b/w32log.h
@@ -1,6 +1,6 @@
-#ifndef _W32LOG_H
-#define _W32LOG_H
-#define W32LOG_H_VERSION "$Id: w32log.h,v 1.5 2001/06/07 23:08:12 jongfoster Exp $"
+#ifndef W32LOG_H_INCLUDED
+#define W32LOG_H_INCLUDED
+#define W32LOG_H_VERSION "$Id: w32log.h,v 1.12 2006/07/18 14:48:48 david__schmidt Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32log.h,v $
@@ -8,8 +8,8 @@
  * Purpose     :  Functions for creating and destroying the log window,
  *                ouputting strings, processing messages and so on.
  *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                IJBSWA team.  http://ijbswa.sourceforge.net
+ * Copyright   :  Written by and Copyright (C) 2001-2009 members of
+ *                the Privoxy team.  http://www.privoxy.org/
  *
  *                Written by and Copyright (C) 1999 Adam Lock
  *                <locka@iol.ie>
@@ -34,6 +34,35 @@
  *
  * Revisions   :
  *    $Log: w32log.h,v $
+ *    Revision 1.12  2006/07/18 14:48:48  david__schmidt
+ *    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ *    with what was really the latest development (the v_3_0_branch branch)
+ *
+ *    Revision 1.10.2.2  2002/11/20 14:39:05  oes
+ *    Fixed compiler warning
+ *
+ *    Revision 1.10.2.1  2002/08/21 17:58:05  oes
+ *    Temp kludge to let user and default action file be edited through win32 GUI (FR 592080)
+ *
+ *    Revision 1.10  2002/03/26 22:57:10  jongfoster
+ *    Web server name should begin www.
+ *
+ *    Revision 1.9  2002/03/24 12:03:47  jongfoster
+ *    Name change
+ *
+ *    Revision 1.8  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.7  2001/07/29 18:43:08  jongfoster
+ *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
+ *    ANSI C rules.
+ *
+ *    Revision 1.6  2001/07/13 14:04:59  oes
+ *    Removed all #ifdef PCRS
+ *
  *    Revision 1.5  2001/06/07 23:08:12  jongfoster
  *    Forward and ACL edit options removed.
  *
@@ -105,7 +134,7 @@ extern BOOL g_bLimitBufferSize;
 extern int g_nMaxBufferLines;
 
 /* Font to use */
-extern char g_szFontFaceName[255];
+extern char g_szFontFaceName[32];
 
 /* Size of font to use */
 extern int g_nFontSize;
@@ -113,14 +142,16 @@ extern int g_nFontSize;
 
 /* FIXME: this is a kludge */
 
-extern const char * g_actions_file;
+extern const char * g_default_actions_file;
+extern const char * g_user_actions_file;
 extern const char * g_re_filterfile;
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
 extern const char * g_trustfile;
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
 
 /* FIXME: end kludge */
 
+extern HICON g_hiconApp;
 extern int LogPutString(const char *pszText);
 extern BOOL InitLogWindow(void);
 extern void TermLogWindow(void);
@@ -135,7 +166,7 @@ extern const char w32log_h_rcs[];
 } /* extern "C" */
 #endif
 
-#endif /* ndef _W32LOG_H */
+#endif /* ndef W32LOG_H_INCLUDED */
 
 
 /*