From 2e5546d71ed397103188d7b7e606696550ef9aaf Mon Sep 17 00:00:00 2001
From: Jani Taskinen <jani@php.net>
Date: Sat, 28 Nov 2009 00:38:05 +0000
Subject: [PATCH] - Fixed bug #50266 (conflicting types for llabs)

---
 NEWS                | 1 +
 ext/date/config0.m4 | 2 ++
 ext/date/php_date.c | 8 ++++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index cf7829b9db5..612587432c4 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@ PHP                                                                        NEWS
 - Fixed bug #50282 (xmlrpc_encode_request() changes object into array in 
   calling function). (Felipe)
 - Fixed bug #50267 (get_browser(null) does not use HTTP_USER_AGENT). (Jani)
+- Fixed bug #50266 (conflicting types for llabs). (Jani)
 - Fixed bug #50255 (isset() and empty() silently casts array to object).
   (Felipe)
 - Fixed bug #50240 (pdo_mysql.default_socket in php.ini shouldn't used
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index f403104a8af..3d03c896992 100644
--- 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 52df63314ea..880b516d9de 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -35,12 +35,12 @@
 # include "win32/php_stdint.h"
 #endif
 
-#if defined(__GNUC__) && __GNUC__ < 3
+#ifndef HAVE_LLABS
+# if 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 */