Merge branch 'PHP-5.6'

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/php_date.c

1 files changed, 1 insertions, 1 deletions

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 94d3a19bcd..b3f6a27c9d 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2967,7 +2967,7 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time *
 			add_assoc_long(&element, "weekdays", parsed_time->relative.special.amount);
 		}
 		if (parsed_time->relative.first_last_day_of) {
-			add_assoc_bool(&element, parsed_time->relative.first_last_day_of == 1 ? "first_day_of_month" : "last_day_of_month", 1);
+			add_assoc_bool(&element, parsed_time->relative.first_last_day_of == TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH ? "first_day_of_month" : "last_day_of_month", 1);
 		}
 		add_assoc_zval(return_value, "relative", &element);
 	}