com php-src: Fix build on MS Windows: ext/standard/pack.c
| From: | Gustavo André dos Santos Lopes | Date: | Sat, 28 Apr 2012 15:32:44 +0000 |
| Subject: | com php-src: Fix build on MS Windows: ext/standard/pack.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68881@lists.php.net to get a copy of this message | ||
Commit: ffec6144123b3d4fdd40be1d8d130f60cb2594d2
Author: Gustavo André dos Santos Lopes <cataphract@php.net> Sat, 28 Apr 2012
16:32:44 +0100
Parents: a1f7423087c85ecd48a034d4a95a2bf19901f13d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ffec6144123b3d4fdd40be1d8d130f60cb2594d2
Log:
Fix build on MS Windows
Changed paths:
M ext/standard/pack.c
Diff:
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index a21d41b..61228a6 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -719,7 +719,8 @@ PHP_FUNCTION(unpack)
case 'Z': {
/* Z will strip everything after the first null character */
char pad = '\0';
- int len = inputlen - inputpos; /* Remaining string */
+ int s,
+ len = inputlen - inputpos; /* Remaining string */
/* If size was given take minimum of len and size */
if ((size >= 0) && (len > size)) {
@@ -729,7 +730,7 @@ PHP_FUNCTION(unpack)
size = len;
/* Remove everything after the first null */
- int s = 0;
+ s = 0;
while (s++ <= len) {
if (input[inputpos + s] == pad)
break;