Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64

* origin/str_size_and_int64_56_backport:
  fix array types for pass by ref
  fix macro
  updated libs_version.txt

ext/interbase/ibase_events.c

@@ -93,7 +93,7 @@ static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count,
 	char **events, unsigned short *l, char **event_buf, char **result_buf)
 {
 	ISC_STATUS dummy_result[20];
-	php_uint_t dummy_count[15];
+	ISC_ULONG dummy_count[15];
 
 	/**
 	 * Unfortunately, there's no clean and portable way in C to pass arguments to
@@ -131,7 +131,7 @@ PHP_FUNCTION(ibase_wait_event)
 	int num_args;
 	char *event_buffer, *result_buffer, *events[15];
 	unsigned short i = 0, event_count = 0, buffer_size;
-	php_uint_t occurred_event[15];
+	ISC_ULONG occurred_event[15];
 
 	RESET_ERRMSG;
 
@@ -209,7 +209,7 @@ static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
 	 */
 	switch (event->state) {
 		unsigned short i;
-		php_uint_t occurred_event[15];
+		ISC_ULONG occurred_event[15];
 		zval event_name, link_id, return_value, *args[2];
 
 		default: /* == DEAD */

ext/interbase/interbase.c

@@ -897,6 +897,7 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
 	char *c, hash[16], *args[] = { NULL, NULL, NULL, NULL, NULL };
 	int i;
 	php_size_t len[] = { 0, 0, 0, 0, 0 };
+	int ilen[] = { 0, 0, 0, 0, 0 };
 	php_int_t largs[] = { 0, 0, 0 };
 	PHP_MD5_CTX hash_context;
 	zend_rsrc_list_entry new_index_ptr, *le;
@@ -929,7 +930,7 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
 		args[CSET] = c;
 		len[CSET] = strlen(c);
 	}
-	
+
 	/* don't want usernames and passwords floating around */
 	PHP_MD5Init(&hash_context);
 	for (i = 0; i < sizeof(args)/sizeof(char*); ++i) {
@@ -988,8 +989,13 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
 			RETURN_FALSE;
 		}
 	
+		/* need to pass it by ref as int * */
+		for (i = 0; i < sizeof(len)/sizeof(php_size_t); i++) {
+			ilen[i] = (int)len[i];
+		}
+		
 		/* create the ib_link */
-		if (FAILURE == _php_ibase_attach_db(args, len, largs, &db_handle TSRMLS_CC)) {
+		if (FAILURE == _php_ibase_attach_db(args, ilen, largs, &db_handle TSRMLS_CC)) {
 			RETURN_FALSE;
 		}
 	

ext/oci8/oci8_statement.c

@@ -1217,7 +1217,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, php_size_t na
 				return 1;
 			}
 			convert_to_boolean(var);
-			bind_data = (int *)&Z_LVAL_P(var);
+			bind_data = (int *)&Z_IVAL_P(var);
 			value_sz = sizeof(int);
 
 			mode = OCI_DEFAULT;

win32/build/libs_version.txt

@@ -1,13 +1,13 @@
 bz2-1.0.6
 cclient-2007f
-freetype-2.4.10
+freetype-2.5.3
 icu-52.1
-jpeglib-9
+jpeglib-9a
 libcurl-7.35.0
 libiconv-1.14
 libmcrypt-2.5.8
 libmpir-2.6.0
-libpng-1.5.14
+libpng-1.5.18
 libpq-9.3.2
 libssh2-1.4.3
 libtidy-20090406