[BACK]Return to calendar.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / calendar

Diff for /src/usr.bin/calendar/calendar.h between version 1.8 and 1.13

version 1.8, 2002/02/16 21:27:44 version 1.13, 2010/04/28 18:20:15
Line 12 
Line 12 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software   * 3. Neither the name of the University nor the names of its contributors
  *    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  
  *    may be used to endorse or promote products derived from this software   *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.   *    without specific prior written permission.
  *   *
Line 38 
Line 34 
 extern int doall;  extern int doall;
 extern int bodun_always;  extern int bodun_always;
 extern time_t f_time;  extern time_t f_time;
 extern struct iovec header[];  
 extern struct tm *tp;  extern struct tm *tp;
 extern char *calendarFile;  extern char *calendarFile;
 extern char *calendarHome;  extern char *calendarHome;
Line 79 
Line 74 
 int      getdayvar(char *);  int      getdayvar(char *);
 int      getfield(char *, char **, int *);  int      getfield(char *, char **, int *);
 int      getmonth(char *);  int      getmonth(char *);
   int      pesach(int);
 int      easter(int);  int      easter(int);
 int      paskha(int);  int      paskha(int);
 void     insert(struct event **, struct event *);  void     insert(struct event **, struct event *);
Line 101 
Line 97 
   
 extern int f_dayAfter;  /* days after current date */  extern int f_dayAfter;  /* days after current date */
 extern int f_dayBefore; /* days before 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 */  /* Special events; see also setnnames() in day.c */
 /* '=' is not a valid character in a special event name */  /* '=' is not a valid character in a special event name */
   #define PESACH "pesach"
   #define PESACHLEN (sizeof(PESACH) - 1)
 #define EASTER "easter"  #define EASTER "easter"
 #define EASTERNAMELEN (sizeof(EASTER) - 1)  #define EASTERNAMELEN (sizeof(EASTER) - 1)
 #define PASKHA "paskha"  #define PASKHA "paskha"
 #define PASKHALEN (sizeof(PASKHA) - 1)  #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];  extern struct specialev spev[NUMEV];
   
 /* For calendar -a, specify a maximum time (in seconds) to spend parsing  /* For calendar -a, specify a maximum time (in seconds) to spend parsing

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.13