com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/php _date.c
| From: | Derick Rethans | Date: | Fri, 29 Jan 2016 14:30:31 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/php _date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90804@lists.php.net to get a copy of this message | ||
Commit: 3523c0a45f51ca2321408e28890e830d902a9409
Author: Derick Rethans <github@derickrethans.nl> Fri, 29 Jan 2016 15:30:31 +0100
Parents: d2c752d7e9134c0db1045d3ee244c5d1ee4eaba9 1a8682568834580b44c448f2e682c704eea626d4
Branches: PHP-7.0 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=3523c0a45f51ca2321408e28890e830d902a9409
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Changed paths:
MM ext/date/php_date.c
Diff:
diff --cc ext/date/php_date.c
index ec1cabc,d5d06f6..2c548ae
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -2142,10 -2196,10 +2142,10 @@@ static int date_object_compare_date(zva
timelib_update_ts(o2->time, o2->time->tz_info);
}
- return (o1->time->sse == o2->time->sse) ? 0 : ((o1->time->sse <
o2->time->sse) ? -1 : 1);
+ return timelib_time_compare(o1->time, o2->time);
-}
+} /* }}} */
-static HashTable *date_object_get_gc(zval *object, zval ***table, int *n TSRMLS_DC)
+static HashTable *date_object_get_gc(zval *object, zval **table, int *n) /* {{{ */
{
*table = NULL;
*n = 0;