=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.h,v retrieving revision 1.8 retrieving revision 1.11 diff -u -r1.8 -r1.11 --- src/usr.bin/calendar/calendar.h 2002/02/16 21:27:44 1.8 +++ src/usr.bin/calendar/calendar.h 2004/12/10 20:47:30 1.11 @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.h,v 1.8 2002/02/16 21:27:44 millert Exp $ */ +/* $OpenBSD: calendar.h,v 1.11 2004/12/10 20:47:30 mickey Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -12,11 +12,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -79,6 +75,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 *); @@ -104,12 +101,18 @@ /* 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