From: jongfoster Date: Fri, 1 Jun 2001 18:14:49 +0000 (+0000) Subject: Changing the calls to strerr() to check HAVE_STRERR (which is defined X-Git-Tag: v_2_9_9~424 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=a8e6e10e532d17d33cbedc4fe4c4027e624c6b1d Changing the calls to strerr() to check HAVE_STRERR (which is defined in config.h if appropriate) rather than the NO_STRERR macro. --- diff --git a/errlog.c b/errlog.c index 59ea1d87..ae98ed3c 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.9 2001/05/28 16:15:17 jongfoster Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.10 2001/05/29 11:52:21 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -33,6 +33,9 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.9 2001/05/28 16:15:17 jongfoster Ex * * Revisions : * $Log: errlog.c,v $ + * Revision 1.10 2001/05/29 11:52:21 oes + * Conditional compilation of w32_socket_error + * * Revision 1.9 2001/05/28 16:15:17 jongfoster * Improved reporting of errors under Win32. * @@ -474,11 +477,11 @@ void log_error(int loglevel, char *fmt, ...) sval = w32_socket_strerr(ival, tempbuf); #else /* ifndef _WIN32 */ ival = errno; -#ifndef NOSTRERROR +#ifdef HAVE_STRERROR sval = strerror(ival); -#else /* def NOSTRERROR */ +#else /* ifndef HAVE_STRERROR */ sval = NULL; -#endif /* def NOSTRERROR */ +#endif /* ndef HAVE_STRERROR */ if (sval == NULL) { sprintf(tempbuf, "(errno = %d)", ival); diff --git a/miscutil.c b/miscutil.c index 8e169fa6..4d39b431 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.4 2001/05/31 17:32:31 oes Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.5 2001/06/01 10:31:51 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -36,6 +36,9 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.4 2001/05/31 17:32:31 oes Exp $ * * Revisions : * $Log: miscutil.c,v $ + * Revision 1.5 2001/06/01 10:31:51 oes + * Added character class matching to trivimatch; renamed to simplematch + * * Revision 1.4 2001/05/31 17:32:31 oes * * - Enhanced domain part globbing with infix and prefix asterisk @@ -208,9 +211,9 @@ char *safe_strerror(int err) char buf[BUFSIZ]; -#ifndef NOSTRERROR +#ifdef HAVE_STRERROR s = strerror(err); -#endif /* NOSTRERROR */ +#endif /* HAVE_STRERROR */ if (s == NULL) {