pajoye Sat, 19 Nov 2011 23:09:12 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319566
Log:
- fix build, ansi c requires constant value, no expresion, even constant var
Changed paths:
U php/php-src/branches/PHP_5_3/ext/phar/phar.c
U php/php-src/branches/PHP_5_4/ext/phar/phar.c
U php/php-src/trunk/ext/phar/phar.c
Modified: php/php-src/branches/PHP_5_3/ext/phar/phar.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/phar.c 2011-11-19 23:04:42 UTC
(rev 319565)
+++ php/php-src/branches/PHP_5_3/ext/phar/phar.c 2011-11-19 23:09:12 UTC
(rev 319566)
@@ -1570,8 +1570,8 @@
const char gz_magic[] = "\x1f\x8b\x08";
const char bz_magic[] = "BZh";
char *pos, test = '\0';
- const int window_size = 1024;
- char buffer[window_size + sizeof(token)]; /* a 1024 byte window + the
size of the halt_compiler token (moving window) */
+ const int window_size = 1024 + sizeof(token);
+ char buffer[1024 + sizeof(token)]; /* a 1024 byte window + the size of
the halt_compiler token (moving window) */
const long readsize = sizeof(buffer) - sizeof(token);
const long tokenlen = sizeof(token) - 1;
long halt_offset;
Modified: php/php-src/branches/PHP_5_4/ext/phar/phar.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/phar/phar.c 2011-11-19 23:04:42 UTC
(rev 319565)
+++ php/php-src/branches/PHP_5_4/ext/phar/phar.c 2011-11-19 23:09:12 UTC
(rev 319566)
@@ -1570,8 +1570,8 @@
const char gz_magic[] = "\x1f\x8b\x08";
const char bz_magic[] = "BZh";
char *pos, test = '\0';
- const int window_size = 1024;
- char buffer[window_size + sizeof(token)]; /* a 1024 byte window + the
size of the halt_compiler token (moving window) */
+ const int window_size = 1024 + sizeof(token);
+ char buffer[1024 + sizeof(token)]; /* a 1024 byte window + the size of
the halt_compiler token (moving window) */
const long readsize = sizeof(buffer) - sizeof(token);
const long tokenlen = sizeof(token) - 1;
long halt_offset;
Modified: php/php-src/trunk/ext/phar/phar.c
===================================================================
--- php/php-src/trunk/ext/phar/phar.c 2011-11-19 23:04:42 UTC (rev 319565)
+++ php/php-src/trunk/ext/phar/phar.c 2011-11-19 23:09:12 UTC (rev 319566)
@@ -1570,8 +1570,8 @@
const char gz_magic[] = "\x1f\x8b\x08";
const char bz_magic[] = "BZh";
char *pos, test = '\0';
- const int window_size = 1024;
- char buffer[window_size + sizeof(token)]; /* a 1024 byte window + the
size of the halt_compiler token (moving window) */
+ const int window_size = 1024 + sizeof(token);
+ char buffer[1024 + sizeof(token)]; /* a 1024 byte window + the size of
the halt_compiler token (moving window) */
const long readsize = sizeof(buffer) - sizeof(token);
const long tokenlen = sizeof(token) - 1;
long halt_offset;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
