From 570ed1a1a4061da99839c47cece8f4ca560ea28f Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 30 Jan 2015 22:32:00 +0100
Subject: [PATCH] fix warnings

---
 main/fopen_wrappers.c        | 3 +++
 main/php_ini.c               | 4 ++++
 main/php_output.h            | 4 ++--
 main/rfc1867.c               | 2 +-
 main/streams/plain_wrapper.c | 3 +++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index dede0efe180..9414ebdf366 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -638,6 +638,9 @@ PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const c
 	}
 
 	filename_length = (int)strlen(filename);
+#ifndef PHP_WIN32
+	(void) filename_length;
+#endif
 
 	/* Relative path open */
 	if ((*filename == '.')
diff --git a/main/php_ini.c b/main/php_ini.c
index c8c5ad88f5f..5703d1fc0df 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -357,6 +357,10 @@ static void php_load_zend_extension_cb(void *arg)
 	char *filename = *((char **) arg);
 	const int length = (int)strlen(filename);
 
+#ifndef PHP_WIN32
+	(void) length;
+#endif
+
 	if (IS_ABSOLUTE_PATH(filename, length)) {
 		zend_load_extension(filename);
 	} else {
diff --git a/main/php_output.h b/main/php_output.h
index 76a7ecd4161..34c344534c4 100644
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -162,8 +162,8 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output);
 #define PHPWRITE(str, str_len)		php_output_write((str), (str_len))
 #define PHPWRITE_H(str, str_len)	php_output_write_unbuffered((str), (str_len))
 
-#define PUTC(c)						(php_output_write(&(c), 1), (c))
-#define PUTC_H(c)					(php_output_write_unbuffered(&(c), 1), (c))
+#define PUTC(c)						(php_output_write((const char *) &(c), 1), (c))
+#define PUTC_H(c)					(php_output_write_unbuffered((const char *) &(c), 1), (c))
 
 #define PUTS(str)					do {				\
 	const char *__str = (str);							\
diff --git a/main/rfc1867.c b/main/rfc1867.c
index a1ba99f08cb..a1d8232dd94 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -425,7 +425,7 @@ static int multipart_buffer_headers(multipart_buffer *self, zend_llist *header)
 		char *value = NULL;
 
 		if (php_rfc1867_encoding_translation()) {
-			self->input_encoding = zend_multibyte_encoding_detector(line, strlen(line), self->detect_order, self->detect_order_size);
+			self->input_encoding = zend_multibyte_encoding_detector((const unsigned char *) line, strlen(line), self->detect_order, self->detect_order_size);
 		}
 
 		/* space in the beginning means same header */
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 284ba05ea83..5e328fbdca5 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -1411,6 +1411,9 @@ PHPAPI php_stream *_php_stream_fopen_with_path(const char *filename, const char
 	}
 
 	filename_length = (int)strlen(filename);
+#ifndef PHP_WIN32
+	(void) filename_length;
+#endif
 
 	/* Relative path open */
 	if (*filename == '.' && (IS_SLASH(filename[1]) || filename[1] == '.')) {