WIN64 support

4 files changed, 10 insertions, 10 deletions

diff --git a/main/SAPI.c b/main/SAPI.c
index 8a53194a1d..3b75fcdc7e 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -567,7 +567,7 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC)
 
 	switch (op) {
 	case SAPI_HEADER_SET_STATUS:
-		sapi_update_response_code((long) arg TSRMLS_CC);
+		sapi_update_response_code((int)(zend_intptr_t) arg TSRMLS_CC);
 		return SUCCESS;
 
 	case SAPI_HEADER_REPLACE:
diff --git a/main/main.c b/main/main.c
index e2899d112f..e67b5953fe 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1087,7 +1087,7 @@ static void php_message_handler_for_zend(long message, void *data)
 				if (message==ZMSG_MEMORY_LEAK_DETECTED) {
 					zend_leak_info *t = (zend_leak_info *) data;
 
-					snprintf(memory_leak_buf, 512, "%s(%d) :  Freeing 0x%.8lX (%zu bytes), script=%s\n", t->filename, t->lineno, (unsigned long)t->addr, t->size, SAFE_FILENAME(SG(request_info).path_translated));
+					snprintf(memory_leak_buf, 512, "%s(%d) :  Freeing 0x%.8lX (%zu bytes), script=%s\n", t->filename, t->lineno, (zend_uintptr_t)t->addr, t->size, SAFE_FILENAME(SG(request_info).path_translated));
 					if (t->orig_filename) {
 						char relay_buf[512];
 
@@ -1095,7 +1095,7 @@ static void php_message_handler_for_zend(long message, void *data)
 						strlcat(memory_leak_buf, relay_buf, sizeof(memory_leak_buf));
 					}
 				} else {
-					unsigned long leak_count = (unsigned long) data;
+					unsigned long leak_count = (zend_uintptr_t) data;
 
 					snprintf(memory_leak_buf, 512, "Last leak repeated %ld time%s\n", leak_count, (leak_count>1?"s":""));
 				}
diff --git a/main/php_ini.c b/main/php_ini.c
index 00774a6883..f705996ba1 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -142,7 +142,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module)
 	}
 	php_info_print_table_start();
 	php_info_print_table_header(3, "Directive", "Local Value", "Master Value");
-	zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (long) module_number TSRMLS_CC);
+	zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (zend_intptr_t) module_number TSRMLS_CC);
 	php_info_print_table_end();
 }
 /* }}} */
@@ -586,7 +586,7 @@ PHPAPI int cfg_get_long(char *varname, long *result)
 	zval *tmp, var;
 	
 	if (zend_hash_find(&configuration_hash, varname, strlen(varname) + 1, (void **) &tmp) == FAILURE) {
-		*result = (long) NULL;
+		*result = 0;
 		return FAILURE;
 	}
 	var = *tmp;
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index d3524a7d39..c809db4c2e 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -223,9 +223,9 @@ PHPAPI php_stream *_php_stream_fopen_from_fd(int fd, const char *mode, const cha
 		}
 #elif defined(PHP_WIN32)
 		{
-			long handle = _get_osfhandle(self->fd);
+			zend_uintptr_t handle = _get_osfhandle(self->fd);
 
-			if (handle != 0xFFFFFFFF) {
+			if (handle != (zend_uintptr_t)INVALID_HANDLE_VALUE) {
 				self->is_pipe = GetFileType((HANDLE)handle) == FILE_TYPE_PIPE;
 			}
 		}
@@ -262,9 +262,9 @@ PHPAPI php_stream *_php_stream_fopen_from_file(FILE *file, const char *mode STRE
 		}
 #elif defined(PHP_WIN32)
 		{
-			long handle = _get_osfhandle(self->fd);
+			zend_uintptr_t handle = _get_osfhandle(self->fd);
 
-			if (handle != 0xFFFFFFFF) {
+			if (handle != (zend_uintptr_t)INVALID_HANDLE_VALUE) {
 				self->is_pipe = GetFileType((HANDLE)handle) == FILE_TYPE_PIPE;
 			}
 		}
@@ -605,7 +605,7 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
 				return -1;
 			}
 
-			if ((long) ptrparam == PHP_STREAM_LOCK_SUPPORTED) {
+			if ((zend_uintptr_t) ptrparam == PHP_STREAM_LOCK_SUPPORTED) {
 				return 0;
 			}