com php-src: fix syslog interference: ext/gd/gd.c ext/gd/libgd/gd.c ext/gd/libgd/gd_errors.h

From: Date: Thu, 13 Oct 2016 12:40:37 +0000
Subject: com php-src: fix syslog interference: ext/gd/gd.c ext/gd/libgd/gd.c ext/gd/libgd/gd_errors.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-95024@lists.php.net to get a copy of this message
Commit: fa451241382397a42322d523f42b1db5f00f7981 Author: Anatol Belski <ab@php.net> Thu, 13 Oct 2016 14:38:51 +0200 Parents: 163093407076df47865dc83547670f65894dae9a Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fa451241382397a42322d523f42b1db5f00f7981 Log: fix syslog interference Changed paths: M ext/gd/gd.c M ext/gd/libgd/gd.c M ext/gd/libgd/gd_errors.h Diff: diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 8e2d088..d214f3c 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1032,8 +1032,10 @@ void php_gd_error_method(int type, const char *format, va_list args) { switch (type) { +#ifndef PHP_WIN32 case GD_DEBUG: case GD_INFO: +#endif case GD_NOTICE: type = E_NOTICE; break; diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index ddf3b5b..4639fac 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -108,12 +108,14 @@ void gd_stderr_error(int priority, const char *format, va_list args) case GD_NOTICE: fputs("GD Notice: ", stderr); break; +#ifndef PHP_WIN32 case GD_INFO: fputs("GD Info: ", stderr); break; case GD_DEBUG: fputs("GD Debug: ", stderr); break; +#endif } vfprintf(stderr, format, args); fflush(stderr); diff --git a/ext/gd/libgd/gd_errors.h b/ext/gd/libgd/gd_errors.h index 4ecee94..8a28bf6 100644 --- a/ext/gd/libgd/gd_errors.h +++ b/ext/gd/libgd/gd_errors.h @@ -4,23 +4,7 @@ #ifndef _WIN32 # include <syslog.h> #else -/* - * priorities/facilities are encoded into a single 32-bit quantity, where the - * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility - * (0-big number). Both the priorities and the facilities map roughly - * one-to-one to strings in the syslogd(8) source code. This mapping is - * included in this file. - * - * priorities (these are ordered) - */ -# define LOG_EMERG 0 /* system is unusable */ -# define LOG_ALERT 1 /* action must be taken immediately */ -# define LOG_CRIT 2 /* critical conditions */ -# define LOG_ERR 3 /* error conditions */ -# define LOG_WARNING 4 /* warning conditions */ -# define LOG_NOTICE 5 /* normal but significant condition */ -# define LOG_INFO 6 /* informational */ -# define LOG_DEBUG 7 /* debug-level messages */ +# include "win32/syslog.h" #endif /*

« previous php.cvs (#95024) next »