- Fixed bug #50266 (conflicting types for llabs)

diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index f403104a8afbeae26eb156531acc68c87a255c3b..3d03c8969921ecf1cfd504fa6bd4b734f20dfe71 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 9ff1d2a791f0079c008d463f5945b84ed961881e..4f40458e3dbc0d0043a3f354ee818e653e42feba 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -36,8 +36,12 @@
 # include "win32/php_stdint.h"
 #endif
 
-#if defined(NETWARE) && defined(__MWERKS__)
+#ifndef HAVE_LLABS
+# if defined(__GNUC__) && __GNUC__ < 3
+static __inline __int64_t llabs( __int64_t i ) { return i >= 0 ? i : -i; }
+# elif defined(NETWARE) && defined(__MWERKS__)
 static __inline long long llabs( long long i ) { return i >= 0 ? i : -i; }
+# endif
 #endif
 
 /* {{{ arginfo */