cvs: php4 /ext/calendar gregor.c jewish.c

sebastian Sat Feb 2 14:27:33 2002 EDT Modified files: /php4/ext/calendar gregor.c jewish.c Log: Fix a warning. Index: php4/ext/calendar/gregor.c diff -u php4/ext/calendar/gregor.c:1.1 php4/ext/calendar/gregor.c:1.2 --- php4/ext/calendar/gregor.c:1.1 Sat Apr 15 16:35:09 2000 +++ php4/ext/calendar/gregor.c Sat Feb 2 14:27:33 2002 @@ -128,7 +128,7 @@ #include "sdncal.h" -#define SDN_OFFSET 32045 +#define GREGOR_SDN_OFFSET 32045 #define DAYS_PER_5_MONTHS 153 #define DAYS_PER_4_YEARS 1461 #define DAYS_PER_400_YEARS 146097 @@ -152,7 +152,7 @@ *pDay = 0; return; } - temp = (sdn + SDN_OFFSET) * 4 - 1; + temp = (sdn + GREGOR_SDN_OFFSET) * 4 - 1; /* Calculate the century (year/100). */ century = temp / DAYS_PER_400_YEARS; @@ -227,7 +227,7 @@ + ((year % 100) * DAYS_PER_4_YEARS) / 4 + (month * DAYS_PER_5_MONTHS + 2) / 5 + inputDay - - SDN_OFFSET); + - GREGOR_SDN_OFFSET); } char *MonthNameShort[13] = Index: php4/ext/calendar/jewish.c diff -u php4/ext/calendar/jewish.c:1.3 php4/ext/calendar/jewish.c:1.4 --- php4/ext/calendar/jewish.c:1.3 Sun Sep 9 09:28:39 2001 +++ php4/ext/calendar/jewish.c Sat Feb 2 14:27:33 2002 @@ -267,7 +267,7 @@ #define HALAKIM_PER_LUNAR_CYCLE ((29 * HALAKIM_PER_DAY) + 13753) #define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7)) -#define SDN_OFFSET 347997 +#define JEWISH_SDN_OFFSET 347997 #define NEW_MOON_OF_CREATION 31524 #define SUNDAY 0 @@ -497,13 +497,13 @@ int tishri1After; int yearLength; - if (sdn <= SDN_OFFSET) { + if (sdn <= JEWISH_SDN_OFFSET) { *pYear = 0; *pMonth = 0; *pDay = 0; return; } - inputDay = sdn - SDN_OFFSET; + inputDay = sdn - JEWISH_SDN_OFFSET; FindTishriMolad(inputDay, &metonicCycle, &metonicYear, &day, &halakim); tishri1 = Tishri1(metonicYear, day, halakim); @@ -728,7 +728,7 @@ return (0); } } - return (sdn + SDN_OFFSET); + return (sdn + JEWISH_SDN_OFFSET); } /*