sniper Sat Nov 29 08:35:34 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS configure.in
/php-src/ext/bcmath .cvsignore config.m4
/php-src/ext/bcmath/libbcmath/src bcmath.h
Log:
MFH: - fixed Bug #26462 (phpize + ext/bcmath -> compile error)
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.484 php-src/NEWS:1.1247.2.485
--- php-src/NEWS:1.1247.2.484 Sat Nov 29 07:10:14 2003
+++ php-src/NEWS Sat Nov 29 08:35:31 2003
@@ -3,6 +3,7 @@
?? ??? 2003, Version 4.3.5
- Fixed header handler in NSAPI SAPI module (header->replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26462 (phpize + ext/bcmath -> compile error). (Jani)
- Fixed bug #26458 (var_dump(), var_export(), debug_zval_dump() not binary
safe for array keys). (Ilia)
- Fixed bug #26447 (--with-openssl=shared causes compile errors). (Jani)
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.87 php-src/configure.in:1.396.2.88
--- php-src/configure.in:1.396.2.87 Sun Nov 2 18:12:02 2003
+++ php-src/configure.in Sat Nov 29 08:35:32 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.87 2003/11/02 23:12:02 iliaa Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.88 2003/11/29 13:35:32 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1206,13 +1206,6 @@
REDO_ALL=yes
fi
-if test ! -f $srcdir/ext/bcmath/number.c; then
- echo "creating number.c"
- echo "/* Dummy File */" > $srcdir/ext/bcmath/number.c
- echo "creating number.h"
- echo "/* Dummy File */" > $srcdir/ext/bcmath/number.h
-fi
-
################################################################
# Create configuration headers
#
Index: php-src/ext/bcmath/.cvsignore
diff -u php-src/ext/bcmath/.cvsignore:1.11 php-src/ext/bcmath/.cvsignore:1.11.4.1
--- php-src/ext/bcmath/.cvsignore:1.11 Sat Apr 20 05:29:51 2002
+++ php-src/ext/bcmath/.cvsignore Sat Nov 29 08:35:32 2003
@@ -1,6 +1,16 @@
-number.h
-number.c
*.lo
*.la
.deps
-COPYING
+*.plg
+*.opt
+*.ncb
+*.dsw
+Release
+Release_inline
+Debug
+Release_TS
+Release_TSDbg
+Release_TS_inline
+Debug_TS
+Release_TS_SSL
+Debug_TS_SSL
Index: php-src/ext/bcmath/config.m4
diff -u php-src/ext/bcmath/config.m4:1.14 php-src/ext/bcmath/config.m4:1.14.4.1
--- php-src/ext/bcmath/config.m4:1.14 Thu Mar 7 09:18:01 2002
+++ php-src/ext/bcmath/config.m4 Sat Nov 29 08:35:32 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.14 2002/03/07 14:18:01 sas Exp $
+dnl $Id: config.m4,v 1.14.4.1 2003/11/29 13:35:32 sniper Exp $
dnl
PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions,
@@ -7,7 +7,7 @@
if test "$PHP_BCMATH" != "no"; then
AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
- PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \
+ PHP_NEW_EXTENSION(bcmath, bcmath.c \
libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c
libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c
libbcmath/src/sub.c \
libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c
libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c
libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c
libbcmath/src/raise.c \
Index: php-src/ext/bcmath/libbcmath/src/bcmath.h
diff -u php-src/ext/bcmath/libbcmath/src/bcmath.h:1.2.10.1
php-src/ext/bcmath/libbcmath/src/bcmath.h:1.2.10.2
--- php-src/ext/bcmath/libbcmath/src/bcmath.h:1.2.10.1 Fri Nov 22 04:27:08 2002
+++ php-src/ext/bcmath/libbcmath/src/bcmath.h Sat Nov 29 08:35:33 2003
@@ -52,9 +52,8 @@
in the case of leading zeros generated. */
} bc_struct;
-#include <php.h>
-#include <ext/bcmath/php_bcmath.h>
-
+#include "php.h"
+#include "../../php_bcmath.h"
/* The base used in storing the numbers in n_value above.
Currently this MUST be 10. */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
