- Fixed bug #50266 (conflicting types for llabs)

diff --git a/NEWS b/NEWS
index 06ec2162a0e958951d5d2c29f142b481e0b58744..10ac56f4163d304569ccfe5a37b4ea75918431c9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,13 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Dec 2009, PHP 5.2.12RC4
+- Fixed bug #50266 (conflicting types for llabs). (Jani)
+
 
 27 Nov 2009, PHP 5.2.12RC3
 - Fixed break in the build chain introduced in 5.2.12RC2 (Jani)
 
+
 26 Nov 2009, PHP 5.2.12RC2
 - Updated timezone database to version 2009.19 (2009s). (Derick)
 

diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index cbd732f4edfbc5f5fe12dd5a35a0c2d9090272e9..62a086bc0861eb5003f3c4860c5b0881fec3e224 100644 (file)
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -16,6 +16,8 @@ PHP_ADD_INCLUDE([$ext_srcdir/lib])
 
 PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h lib/timelib_structs.h lib/timelib_config.h])
 
+AC_CHECK_FUNCS([llabs])
+
 cat > $ext_builddir/lib/timelib_config.h <<EOF
 #ifdef PHP_WIN32
 # include "config.w32.h"

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 60f8f05ac8581ee521ae4a6b7accb89dcf401e03..0b9dcad5f1df4c32403df13e330143e75967d9f4 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -30,16 +30,14 @@
 #include "lib/timelib.h"
 #include <time.h>
 
-#ifdef PHP_WIN32
+#ifndef HAVE_LLABS
+# ifdef PHP_WIN32
 static __inline __int64 llabs( __int64 i ) { return i >= 0? i: -i; }
-#endif
-
-#if defined(__GNUC__) && __GNUC__ < 3
+# elif defined(__GNUC__) && __GNUC__ < 3
 static __inline __int64_t llabs( __int64_t i ) { return i >= 0 ? i : -i; }
-#endif
-
-#if defined(NETWARE) && defined(__MWERKS__)
+# elif defined(NETWARE) && defined(__MWERKS__)
 static __inline long long llabs( long long i ) { return i >= 0 ? i : -i; }
+# endif
 #endif
 
 /* {{{ arginfo */