From: Stefan Esser <sesser@php.net>
Date: Mon, 17 Jan 2005 12:28:08 +0000 (+0000)
Subject: MFH: 64bit fixes
X-Git-Tag: php-4.3.11RC1~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46e105528873c2effc5e360531fa48791b99ab4c;p=php

MFH: 64bit fixes
---

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index c0b5e73905..3b3fad1e2e 100644
--- 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 4495d052b4..ebd15d54dd 100644
--- 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);
 }