===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/calendar/calendar.h,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -r1.5 -r1.9
--- src/usr.bin/calendar/calendar.h	2001/09/03 15:53:00	1.5
+++ src/usr.bin/calendar/calendar.h	2003/06/03 02:56:06	1.9
@@ -1,4 +1,4 @@
-/*	$OpenBSD: calendar.h,v 1.5 2001/09/03 15:53:00 pjanzen Exp $	*/
+/*	$OpenBSD: calendar.h,v 1.9 2003/06/03 02:56:06 millert 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.
  *
@@ -36,6 +32,7 @@
 
 extern struct passwd *pw;
 extern int doall;
+extern int bodun_always;
 extern time_t f_time;
 extern struct iovec header[];
 extern struct tm *tp;
@@ -59,6 +56,7 @@
 struct match {
 	time_t	when;
 	char	print_date[30];
+	int	bodun;
 	int	var;
 	struct match	*next;
 };
@@ -68,26 +66,26 @@
 	int nlen;
 	char *uname;
 	int ulen;
-	int (*getev) __P((int));
+	int (*getev)(int);
 };
 
-void	 cal __P((void));
-void	 closecal __P((FILE *));
-int	 getday __P((char *));
-int	 getdayvar __P((char *));
-int	 getfield __P((char *, char **, int *));
-int	 getmonth __P((char *));
-int	 easter __P((int));
-int	 paskha __P((int));
-void	 insert __P((struct event **, struct event *));
-struct match	*isnow __P((char *));
-FILE	*opencal __P((void));
-void	 settime __P((time_t *));
-time_t	 Mktime __P((char *));
-void	 usage __P((void));
-int	 foy __P((int));
-void	 variable_weekday __P((int *, int, int));
-void	 setnnames __P((void));
+void	 cal(void);
+void	 closecal(FILE *);
+int	 getday(char *);
+int	 getdayvar(char *);
+int	 getfield(char *, char **, int *);
+int	 getmonth(char *);
+int	 easter(int);
+int	 paskha(int);
+void	 insert(struct event **, struct event *);
+struct match	*isnow(char *, int);
+FILE	*opencal(void);
+void	 settime(time_t *);
+time_t	 Mktime(char *);
+void	 usage(void);
+int	 foy(int);
+void	 variable_weekday(int *, int, int);
+void	 setnnames(void);
 
 /* some flags */
 #define	F_ISMONTH	0x01 /* month (Januar ...) */