=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.h,v retrieving revision 1.11 retrieving revision 1.15 diff -u -r1.11 -r1.15 --- src/usr.bin/calendar/calendar.h 2004/12/10 20:47:30 1.11 +++ src/usr.bin/calendar/calendar.h 2015/12/07 18:46:35 1.15 @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.h,v 1.11 2004/12/10 20:47:30 mickey Exp $ */ +/* $OpenBSD: calendar.h,v 1.15 2015/12/07 18:46:35 espie Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -32,9 +32,9 @@ extern struct passwd *pw; extern int doall; +extern int daynames; extern int bodun_always; extern time_t f_time; -extern struct iovec header[]; extern struct tm *tp; extern char *calendarFile; extern char *calendarHome; @@ -45,9 +45,11 @@ int len; }; +#define PRINT_DATE_BASE_LEN 35 + struct event { time_t when; - char print_date[31]; + char print_date[PRINT_DATE_BASE_LEN+1]; char **desc; char *ldesc; struct event *next; @@ -55,7 +57,7 @@ struct match { time_t when; - char print_date[30]; + char print_date[PRINT_DATE_BASE_LEN]; int bodun; int var; struct match *next; @@ -96,8 +98,12 @@ * calendar time--e.g. Easter or easter depending * days */ +#define SECSPERDAY (24 * 60 * 60) +#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) + extern int f_dayAfter; /* days after current date */ extern int f_dayBefore; /* days before current date */ +extern int f_SetdayAfter; /* calendar invoked with -A */ /* Special events; see also setnnames() in day.c */ /* '=' is not a valid character in a special event name */