iliaa Mon Jun 22 13:43:14 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date php_date.c
Log:
MFB: Fixed bug #48636 (Error compiling of ext/date on netware).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.81&r2=1.43.2.45.2.51.2.82&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.81
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.82
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.81 Sun Jun 21 22:19:11 2009
+++ php-src/ext/date/php_date.c Mon Jun 22 13:43:14 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.81 2009/06/21 22:19:11 scottmac Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.82 2009/06/22 13:43:14 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -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 @@
}
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
