From: Jani Taskinen <jani@php.net>
Date: Thu, 20 Aug 2009 11:19:20 +0000 (+0000)
Subject: - Fixed bug #49289 (bcmath module does not compile with phpize configure).
X-Git-Tag: php-5.2.11RC2~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c935d237918d4ce6b2484ea8c9955368e2b7ad9c;p=php

- Fixed bug #49289 (bcmath module does not compile with phpize configure).
---

diff --git a/NEWS b/NEWS
index 12c3343620..2f51a96b85 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2009, PHP 5.2.11
 - Added missing sanity checks around exif processing (Ilia)
 
+- Fixed bug #49289 (bcmath module doesn't compile with phpize configure).
+  (Jani)
 - Fixed bug #49269 (Ternary operator fails on Iterator object when used inside
   foreach declaration). (Etienne, Dmitry)
 - Fixed bug #49236 (Missing PHP_SUBST(PDO_MYSQL_SHARED_LIBADD)). (Jani)
diff --git a/ext/bcmath/php_bcmath.h b/ext/bcmath/php_bcmath.h
index b8e3589652..b92f62d14b 100644
--- a/ext/bcmath/php_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -21,8 +21,6 @@
 #ifndef PHP_BCMATH_H
 #define PHP_BCMATH_H
 
-#if HAVE_BCMATH
-
 #include "libbcmath/src/bcmath.h"
 
 extern zend_module_entry bcmath_module_entry;
@@ -50,18 +48,12 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath)
 	long bc_precision;
 ZEND_END_MODULE_GLOBALS(bcmath)
 	
-#if ZTS
-#define BCG(v) TSRMG(bcmath_globals_id, zend_bcmath_globals *, v)
+#ifdef ZTS
+# define BCG(v) TSRMG(bcmath_globals_id, zend_bcmath_globals *, v)
 #else
-#define BCG(v) (bcmath_globals.v)
+# define BCG(v) (bcmath_globals.v)
 #endif
 
 ZEND_EXTERN_MODULE_GLOBALS(bcmath)
 
-#else
-
-#define phpext_bcmath_ptr NULL
-
-#endif
-
 #endif /* PHP_BCMATH_H */