]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorDerick Rethans <github@derickrethans.nl>
Fri, 29 Jan 2016 14:30:31 +0000 (15:30 +0100)
committerDerick Rethans <github@derickrethans.nl>
Fri, 29 Jan 2016 14:30:31 +0000 (15:30 +0100)
1  2 
ext/date/php_date.c

index ec1cabc34df8a6ab5ee3b683d88610835083d8ee,d5d06f6b2778fdec1f54321d96726b163c16270d..2c548ae6f472677d165545ac5ac474baf9a05ce7
@@@ -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;