From: Derick Rethans <github@derickrethans.nl>
Date: Fri, 29 Jan 2016 14:30:31 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.2.0alpha1~620^2~49^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3523c0a45f51ca2321408e28890e830d902a9409;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

3523c0a45f51ca2321408e28890e830d902a9409
diff --cc ext/date/php_date.c
index ec1cabc34d,d5d06f6b27..2c548ae6f4
--- 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;