From: jongfoster Date: Sun, 20 May 2001 15:07:54 +0000 (+0000) Subject: File is now ignored if _WIN_CONSOLE is defined. X-Git-Tag: v_2_9_9~518 X-Git-Url: http://www.privoxy.org/gitweb/developer-manual/index.html?a=commitdiff_plain;h=4556222a07fe07c2efad678013a66eac670c4296;p=privoxy.git File is now ignored if _WIN_CONSOLE is defined. --- diff --git a/w32log.c b/w32log.c index 6904c796..3910aec6 100644 --- a/w32log.c +++ b/w32log.c @@ -1,4 +1,4 @@ -const char w32log_rcs[] = "$Id: w32log.c,v 1.1.1.1 2001/05/15 13:59:07 oes Exp $"; +const char w32log_rcs[] = "$Id: w32log.c,v 1.2 2001/05/20 01:21:20 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/w32log.c,v $ @@ -32,6 +32,19 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.1.1.1 2001/05/15 13:59:07 oes Exp $ * * Revisions : * $Log: w32log.c,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:59:07 oes * Initial import of version 2.9.3 source tree * @@ -65,6 +78,8 @@ const char cygwin_h_rcs[] = CYGWIN_H_VERSION; #endif const char w32log_h_rcs[] = W32LOG_H_VERSION; + +#ifndef _WIN_CONSOLE /* entire file */ /* * Timers and the various durations @@ -1307,6 +1322,7 @@ LRESULT CALLBACK LogWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara } +#endif /* ndef _WIN_CONSOLE - entire file */ /* Local Variables: diff --git a/w32rulesdlg.c b/w32rulesdlg.c index 845995b0..b40b45ac 100644 --- a/w32rulesdlg.c +++ b/w32rulesdlg.c @@ -1,7 +1,7 @@ -const char w32rulesdlg_rcs[] = "$Id: w32rulesdlg.c,v 1.1 2001/05/13 21:57:07 administrator Exp $"; +const char w32rulesdlg_rcs[] = "$Id: w32rulesdlg.c,v 1.1.1.1 2001/05/15 13:59:08 oes Exp $"; /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/w32rulesdlg.c,v $ + * File : $Source: /cvsroot/ijbswa/current/w32rulesdlg.c,v $ * * Purpose : A dialog to allow GUI editing of the rules. * Unfinished. @@ -32,6 +32,9 @@ const char w32rulesdlg_rcs[] = "$Id: w32rulesdlg.c,v 1.1 2001/05/13 21:57:07 adm * * Revisions : * $Log: w32rulesdlg.c,v $ + * Revision 1.1.1.1 2001/05/15 13:59:08 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ @@ -51,6 +54,8 @@ const char w32rulesdlg_rcs[] = "$Id: w32rulesdlg.c,v 1.1 2001/05/13 21:57:07 adm #endif const char w32rulesdlg_h_rcs[] = W32RULESDLG_H_VERSION; + +#ifndef _WIN_CONSOLE /* entire file */ const int nSmallIconWidth = 16; const int nSmallIconHeight = 16; @@ -524,6 +529,7 @@ static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l } +#endif /* ndef _WIN_CONSOLE - entire file */ /* Local Variables: diff --git a/w32taskbar.c b/w32taskbar.c index 62f269d0..ae08843d 100644 --- a/w32taskbar.c +++ b/w32taskbar.c @@ -1,7 +1,7 @@ -const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.1 2001/05/13 21:57:07 administrator Exp $"; +const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.1.1.1 2001/05/15 13:59:08 oes Exp $"; /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/w32taskbar.c,v $ + * File : $Source: /cvsroot/ijbswa/current/w32taskbar.c,v $ * * Purpose : Functions for creating, setting and destroying the * workspace tray icon @@ -32,6 +32,9 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.1 2001/05/13 21:57:07 admin * * Revisions : * $Log: w32taskbar.c,v $ + * Revision 1.1.1.1 2001/05/15 13:59:08 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ @@ -47,6 +50,8 @@ const char w32taskbar_rcs[] = "$Id: w32taskbar.c,v 1.1 2001/05/13 21:57:07 admin #include "w32log.h" const char w32taskbar_h_rcs[] = W32TASKBAR_H_VERSION; + +#ifndef _WIN_CONSOLE /* entire file */ #define WM_TRAYMSG WM_USER+1 @@ -255,6 +260,8 @@ LRESULT CALLBACK TrayProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) } +#endif /* ndef _WIN_CONSOLE - entire file */ + /* Local Variables: tab-width: 3