From 129846f6ee173196c956f13462fcde6e8dcb7a9c Mon Sep 17 00:00:00 2001 From: Timm Friebe Date: Mon, 1 Oct 2018 20:09:50 +0200 Subject: [PATCH 1/2] Fix "warning: initialization from incompatible pointer type" --- engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine.c b/engine.c index f94bfca..d3a7ead 100644 --- a/engine.c +++ b/engine.c @@ -63,7 +63,7 @@ static void engine_register_variables(zval *track_vars_array) { php_import_environment_variables(track_vars_array); } -static void engine_log_message(char *str) { +static void engine_log_message(char *str, int syslog_type_int) { engine_context *context = SG(server_context); engineWriteLog(context, (void *) str, strlen(str)); From f7137ab32840cc217f6b5d32f183dbc6a378b219 Mon Sep 17 00:00:00 2001 From: Timm Friebe Date: Mon, 1 Oct 2018 20:19:14 +0200 Subject: [PATCH 2/2] Use old signature for engine_log_message w/ PHP < 7.1 See https://github.com/deuill/go-php/pull/58#issuecomment-426009629 --- engine.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/engine.c b/engine.c index d3a7ead..4c87203 100644 --- a/engine.c +++ b/engine.c @@ -63,7 +63,11 @@ static void engine_register_variables(zval *track_vars_array) { php_import_environment_variables(track_vars_array); } +#if PHP_VERSION_ID < 70100 +static void engine_log_message(char *str) { +#else static void engine_log_message(char *str, int syslog_type_int) { +#endif engine_context *context = SG(server_context); engineWriteLog(context, (void *) str, strlen(str));