diary

commit 3eafa035474dbd38b1254ea1eefc2a33e8a7b2d3
parent acf7e34483a6a0dc37952b62885882a5df0583a0
Author: Johnathan Jenkins <john@nixheads.co.uk>
Date:   Tue, 20 Dec 2016 12:06:16 -0800

fix merge conflict

Diffstat:
M
diary.c
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/diary.c b/diary.c
@@ -300,7 +300,7 @@ int main(int argc, char** argv) {
         return 1;
     }
 
-    {
+    #ifdef __GNU_LIBRARY__
         // references: locale(5) and util-linux's cal.c
         // get the base date, 8-digit integer (YYYYMMDD) returned as char *
         #ifdef _NL_TIME_WEEK_1STDAY
@@ -329,7 +329,8 @@ int main(int argc, char** argv) {
             CFRelease(currentCalendar);
             first_weekday = (base.tm_wday + first_day_of_week - 1) % 7;
         #endif
-    }
+    #endif
+
     setup_cal_timeframe();
 
     initscr();