summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2009-06-22 13:43:14 +0000
committerIlia Alshanetsky <iliaa@php.net>2009-06-22 13:43:14 +0000
commitbc8e35748248ebb0d00ed968b339df34d31b7fc0 (patch)
treec3da818710a257b682c72a2fee761db657c98773
parent58c717ff8fd8466c24a30fbf9514c771bb331c39 (diff)
downloadphp-git-bc8e35748248ebb0d00ed968b339df34d31b7fc0.tar.gz
MFB: Fixed bug #48636 (Error compiling of ext/date on netware).
-rw-r--r--ext/date/php_date.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index b836eada77..d8cec0224a 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -39,6 +39,10 @@
static __inline __int64_t llabs( __int64_t i ) { return i >= 0 ? i : -i; }
#endif
+#if defined(NETWARE) && defined(__MWERKS__)
+static __inline long long llabs( long long i ) { return i >= 0 ? i : -i; }
+#endif
+
/* {{{ arginfo */
ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
ZEND_ARG_INFO(0, format)
@@ -2406,7 +2410,7 @@ static int date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, int
}
timelib_unixtime2local(now, (timelib_sll) time(NULL));
- timelib_fill_holes(dateobj->time, now, 0);
+ timelib_fill_holes(dateobj->time, now, TIMELIB_NO_CLONE);
timelib_update_ts(dateobj->time, tzi);
dateobj->time->have_relative = 0;