Hi,
One patch for 5.3 and one for HEAD, where they're not synched with the
other. 5.3's math changes the other day missed one change to the php_*
function (snaps are failing). And HEAD's Win Makefile still contains
references to flex.skl after the re2c change, which causes an error for me,
though its snaps are building, so maybe I'm the only one?
- Matt
Index: ext/standard/math.c
===================================================================
RCS file: /repository/php-src/ext/standard/math.c,v
retrieving revision 1.131.2.2.2.6.2.7
diff -u -r1.131.2.2.2.6.2.7 math.c
--- ext/standard/math.c 6 May 2008 10:55:49 -0000 1.131.2.2.2.6.2.7
+++ ext/standard/math.c 7 May 2008 10:18:10 -0000
@@ -354,7 +354,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num) ==
FAILURE) {
return;
}
- RETURN_DOUBLE(asinh(num));
+ RETURN_DOUBLE(php_asinh(num));
}
/* }}} */
Index: win32/build/Makefile
===================================================================
RCS file: /repository/php-src/win32/build/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- win32/build/Makefile 26 Mar 2008 14:46:17 -0000 1.45
+++ win32/build/Makefile 7 May 2008 10:30:30 -0000
@@ -50,10 +50,10 @@
$(BISON) --output=Zend/zend_language_parser.c -v -d -p zend
Zend/zend_language_parser.y
!if $(RE2C) != ""
-Zend\zend_ini_scanner.c: Zend\flex.skl Zend\zend_ini_scanner.l
+Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt
Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
-Zend\zend_language_scanner.c: Zend\flex.skl Zend\zend_language_scanner.l
+Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt
Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c
Zend/zend_language_scanner.l
!endif
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
