X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=errlog.c;h=7fc78a3853b4920f5200d164c092deac92a412fa;hb=df2957e0e1ce85b69b1480d64d40ec13ca798e3c;hp=48290a95049c580760b8b43ae3aaabfabe383f4f;hpb=72081f829de368392d04076728f8c991178c0080;p=privoxy.git diff --git a/errlog.c b/errlog.c index 48290a95..7fc78a38 100644 --- a/errlog.c +++ b/errlog.c @@ -1,7 +1,7 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.40.2.4 2005/04/03 20:10:50 david__schmidt Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.44 2006/08/18 16:03:16 david__schmidt Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/Attic/errlog.c,v $ + * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ * * Purpose : Log errors to a designated destination in an elegant, * printf-like fashion. @@ -33,6 +33,17 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.40.2.4 2005/04/03 20:10:50 david__s * * Revisions : * $Log: errlog.c,v $ + * Revision 1.44 2006/08/18 16:03:16 david__schmidt + * Tweak for OS/2 build happiness. + * + * Revision 1.43 2006/08/03 02:46:41 david__schmidt + * Incorporate Fabian Keil's patch work: + * http://www.fabiankeil.de/sourcecode/privoxy/ + * + * Revision 1.42 2006/07/18 14:48:46 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.40.2.4 2005/04/03 20:10:50 david__schmidt * Thanks to Jindrich Makovicka for a race condition fix for the log * file. The race condition remains for non-pthread implementations. @@ -263,6 +274,9 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.40.2.4 2005/04/03 20:10:50 david__s #include "w32log.h" #endif /* ndef _WIN_CONSOLE */ #endif /* def _WIN32 */ +#ifdef _MSC_VER +#define inline __inline +#endif /* def _MSC_VER */ #ifdef __OS2__ #include /* For sock_errno */ @@ -288,7 +302,7 @@ const char errlog_h_rcs[] = ERRLOG_H_VERSION; static FILE *logfp = NULL; /* logging detail level. */ -static int debug = (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO); +int debug = (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO); /* static functions */ static void fatal_error(const char * error_message);