]> granicus.if.org Git - php/commitdiff
fix pack64.phpt related fail on win64
authorAnatol Belski <ab@php.net>
Thu, 23 Oct 2014 12:36:55 +0000 (14:36 +0200)
committerAnatol Belski <ab@php.net>
Thu, 23 Oct 2014 13:47:47 +0000 (15:47 +0200)
ext/standard/pack.c

index 07206c8b7ba1ba38ff5b471ac0ffb60cc520469c..4af72c34b805d6043c8482c2831b4f9ed4de9e61 100644 (file)
@@ -912,7 +912,7 @@ PHP_FUNCTION(unpack)
                                        case 'P': {
                                                int issigned = 0;
                                                int *map = machine_endian_longlong_map;
-                                               long v = 0;
+                                               zend_long v = 0;
 
                                                if (type == 'q' || type == 'Q') {
                                                        issigned = input[inputpos + (machine_little_endian ? 7 : 0)] & 0x80;
@@ -927,9 +927,9 @@ PHP_FUNCTION(unpack)
                                                v = php_unpack(&input[inputpos], 8, issigned, map);
 
                                                if (type == 'q') {
-                                                       v = (signed long int) v;
+                                                       v = (zend_long) v;
                                                } else {
-                                                       v = (unsigned long int) v;
+                                                       v = (zend_ulong) v;
                                                }
 
                                                add_assoc_long(return_value, n, v);