===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.h,v
retrieving revision 1.9
retrieving revision 1.16
diff -u -r1.9 -r1.16
--- src/usr.bin/calendar/calendar.h	2003/06/03 02:56:06	1.9
+++ src/usr.bin/calendar/calendar.h	2019/01/29 20:08:56	1.16
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.h,v 1.9 2003/06/03 02:56:06 millert Exp $	*/
+/*	$OpenBSD: calendar.h,v 1.16 2019/01/29 20:08:56 millert 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;
@@ -75,6 +77,7 @@
 int	 getdayvar(char *);
 int	 getfield(char *, char **, int *);
 int	 getmonth(char *);
+int	 pesach(int);
 int	 easter(int);
 int	 paskha(int);
 void	 insert(struct event **, struct event *);
@@ -95,17 +98,26 @@
 			      * 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 */
 
 /* Special events; see also setnnames() in day.c */
 /* '=' is not a valid character in a special event name */
+#define PESACH "pesach"
+#define PESACHLEN (sizeof(PESACH) - 1)
 #define EASTER "easter"
 #define EASTERNAMELEN (sizeof(EASTER) - 1)
 #define PASKHA "paskha"
 #define PASKHALEN (sizeof(PASKHA) - 1)
 
-#define NUMEV 2	/* Total number of such special events */
+/* calendars */
+extern enum calendars { GREGORIAN = 0, JULIAN, LUNAR } calendar;
+extern u_long julian;
+
+#define NUMEV 3	/* Total number of such special events */
 extern struct specialev spev[NUMEV];
 
 /* For calendar -a, specify a maximum time (in seconds) to spend parsing