# Added date/time stamping to php3_log_error

@ Preliminary support for date/time stamping in error logs
Preliminary support for date/time stamping in error logs

diff --git a/ext/bcmath/Makefile.am b/ext/bcmath/Makefile.am
index e529f579aef9262c6ee643e09b3dd265bb73783d..e73bafce78ed7dfe09a97c665f03b73a629ce4b7 100644 (file)
--- a/ext/bcmath/Makefile.am
+++ b/ext/bcmath/Makefile.am
@@ -1,4 +1,5 @@
 # $Id$
 
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_bcmath.la
 libphpext_bcmath_la_SOURCES=bcmath.c number.c

diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index e39f60244566e5e61acb73a766e142f6c2b0e673..d4a7032376a86b359857a9ff6cbf90b53776c4fe 100644 (file)
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -21,7 +21,7 @@
 #if WITH_BCMATH
 
 #include "number.h"
-#include "php_bcmath.h"
+#include "php3_bcmath.h"
 
 function_entry bcmath_functions[] = {
        PHP_FE(bcadd,                                                                   NULL)

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 76195c460509f9f45919d5771055cb139907e692..931eb9df1154bf0434a1fecbdeee98627d94db8b 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -906,7 +906,7 @@ void _xml_unparsedEntityDeclHandler(void *userData,
        xml_parser *parser = (xml_parser *)userData;
 
        if (parser && parser->unparsedEntityDeclHandler) {
-               zval *retval, *args[5];
+               zval *retval, *args[6];
 
                args[0] = _xml_resource_zval(parser->index);
                args[1] = _xml_xmlchar_zval(entityName, 0, parser->target_encoding);