MFH: 64bit fixes

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index c0b5e73905572f2da80f3cdd3ab806cf000194ff..3b3fad1e2e9e6199f7cadf8a1dc67ae36fd841bf 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -279,7 +279,7 @@ static inline int finish_nested_data(UNSERIALIZE_PARAMETER)
 
 static inline int object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 {
-       long elements;
+       int elements;
 
        elements = parse_iv2((*p) + 2, p);
 
@@ -621,7 +621,7 @@ yy36:       yych = *++YYCURSOR;
 yy37:
 #line 419
        {
-       long elements = parse_iv(start + 2);
+       int elements = parse_iv(start + 2);
 
        *p = YYCURSOR;
 

diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 4495d052b41c020f457fc3af6b21da8fdd1e55a3..ebd15d54dd66c1887d4dfd0feebb54cfd6ab8912 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -155,10 +155,10 @@ any = [\000-\277];
 
 
 
-static inline int parse_iv2(const unsigned char *p, const unsigned char **q)
+static inline long parse_iv2(const unsigned char *p, const unsigned char **q)
 {
        char cursor;
-       int result = 0;
+       long result = 0;
        int neg = 0;
 
        switch (*p) {
@@ -183,7 +183,7 @@ static inline int parse_iv2(const unsigned char *p, const unsigned char **q)
        return result;
 }
 
-static inline int parse_iv(const unsigned char *p)
+static inline long parse_iv(const unsigned char *p)
 {
        return parse_iv2(p, NULL);
 }