Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 7f811d9c4ebc9444e613e251c31d6bf537a24dc1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 13 Apr 2015 16:35:30 -0700 |
| 4 | Subject: [PATCH] remove glibc assumption |
| 5 | |
| 6 | glibc time.h header has an undocumented __isleap macro |
| 7 | that we are using anf musl is missing it. |
| 8 | Since it is undocumented & does not appear |
| 9 | on any other libc, stop using it and just define the macro in |
| 10 | locally instead. |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | parsetime.y | 11 +++++++---- |
| 17 | 1 file changed, 7 insertions(+), 4 deletions(-) |
| 18 | |
| 19 | diff --git a/parsetime.y b/parsetime.y |
| 20 | index 7005e88..324e6d3 100644 |
| 21 | --- a/parsetime.y |
| 22 | +++ b/parsetime.y |
| 23 | @@ -8,6 +8,9 @@ |
| 24 | |
| 25 | #define YYDEBUG 1 |
| 26 | |
| 27 | +#define is_leap_year(y) \ |
| 28 | + ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) |
| 29 | + |
| 30 | struct tm exectm; |
| 31 | static int isgmt; |
| 32 | static int yearspec; |
| 33 | @@ -217,8 +220,8 @@ date : month_name day_number |
| 34 | mnum == 12) && dnum > 31) |
| 35 | || ((mnum == 4 || mnum == 6 || mnum == 9 || |
| 36 | mnum == 11) && dnum > 30) |
| 37 | - || (mnum == 2 && dnum > 29 && __isleap(ynum+1900)) |
| 38 | - || (mnum == 2 && dnum > 28 && !__isleap(ynum+1900)) |
| 39 | + || (mnum == 2 && dnum > 29 && is_leap_year(ynum+1900)) |
| 40 | + || (mnum == 2 && dnum > 28 && !is_leap_year(ynum+1900)) |
| 41 | ) |
| 42 | { |
| 43 | yyerror("Error in day of month"); |
| 44 | @@ -261,8 +264,8 @@ date : month_name day_number |
| 45 | mnum == 12) && dnum > 31) |
| 46 | || ((mnum == 4 || mnum == 6 || mnum == 9 || |
| 47 | mnum == 11) && dnum > 30) |
| 48 | - || (mnum == 2 && dnum > 29 && __isleap(ynum+1900)) |
| 49 | - || (mnum == 2 && dnum > 28 && !__isleap(ynum+1900)) |
| 50 | + || (mnum == 2 && dnum > 29 && is_leap_year(ynum+1900)) |
| 51 | + || (mnum == 2 && dnum > 28 && !is_leap_year(ynum+1900)) |
| 52 | ) |
| 53 | { |
| 54 | yyerror("Error in day of month"); |
| 55 | -- |
| 56 | 2.1.4 |
| 57 | |