From: Jani Taskinen <jani@php.net>
Date: Sat, 28 Nov 2009 00:38:05 +0000 (+0000)
Subject: - Fixed bug #50266 (conflicting types for llabs)
X-Git-Tag: php-5.4.0alpha1~191^2~2329
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d651c6e0c0cfc7db002504daf503550e0921b8d0;p=php

- Fixed bug #50266 (conflicting types for llabs)
---

diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index f403104a8a..3d03c89699 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 9ff1d2a791..4f40458e3d 100644
--- 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 */