projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log_error(): Reduce the mutex-protected area
[privoxy.git]
/
w32log.c
diff --git
a/w32log.c
b/w32log.c
index
c524ffa
..
ae00ba5
100644
(file)
--- a/
w32log.c
+++ b/
w32log.c
@@
-1,4
+1,4
@@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.
48 2012/05/27 15:45:05 fabiankeil
Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.
52 2016/07/28 00:38:47 ler762
Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32log.c,v $
@@
-41,6
+41,7
@@
const char w32log_rcs[] = "$Id: w32log.c,v 1.48 2012/05/27 15:45:05 fabiankeil E
#ifndef STRICT
#define STRICT
#endif
#ifndef STRICT
#define STRICT
#endif
+#include <winsock2.h>
#include <windows.h>
#include <richedit.h>
#include <windows.h>
#include <richedit.h>
@@
-56,11
+57,6
@@
const char w32log_rcs[] = "$Id: w32log.c,v 1.48 2012/05/27 15:45:05 fabiankeil E
const char w32res_h_rcs[] = W32RES_H_VERSION;
const char w32res_h_rcs[] = W32RES_H_VERSION;
-#ifdef __MINGW32__
-#include "cygwin.h"
-const char cygwin_h_rcs[] = CYGWIN_H_VERSION;
-#endif
-
const char w32log_h_rcs[] = W32LOG_H_VERSION;
#ifndef _WIN_CONSOLE /* entire file */
const char w32log_h_rcs[] = W32LOG_H_VERSION;
#ifndef _WIN_CONSOLE /* entire file */
@@
-172,6
+168,9
@@
static struct _Pattern
{ "Connect: Reusing server socket", STYLE_HIGHLIGHT },
{ "Connect: Created new connection to", STYLE_HIGHLIGHT },
{ "hung up on us", STYLE_HIGHLIGHT },
{ "Connect: Reusing server socket", STYLE_HIGHLIGHT },
{ "Connect: Created new connection to", STYLE_HIGHLIGHT },
{ "hung up on us", STYLE_HIGHLIGHT },
+ { "Info: Loading actions file:", STYLE_HIGHLIGHT },
+ { "Info: Loading filter file:", STYLE_HIGHLIGHT },
+ { "Info: Now toggled ", STYLE_HIGHLIGHT },
{ "Crunching Referer:", STYLE_HIGHLIGHT },
/* what are all the possible error strings?? */
{ "Error:", STYLE_HIGHLIGHT },
{ "Crunching Referer:", STYLE_HIGHLIGHT },
/* what are all the possible error strings?? */
{ "Error:", STYLE_HIGHLIGHT },