]> granicus.if.org Git - php/commitdiff
Fix a warning.
authorSebastian Bergmann <sebastian@php.net>
Sat, 2 Feb 2002 19:27:33 +0000 (19:27 +0000)
committerSebastian Bergmann <sebastian@php.net>
Sat, 2 Feb 2002 19:27:33 +0000 (19:27 +0000)
ext/calendar/gregor.c
ext/calendar/jewish.c

index ef0a01ea669f7e812339a17ef32fd52aac74026f..f48950901a60520cbe420de76fc7fecbadbaff0b 100644 (file)
 
 #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 @@ void SdnToGregorian(
                *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 @@ long int GregorianToSdn(
                        + ((year % 100) * DAYS_PER_4_YEARS) / 4
                        + (month * DAYS_PER_5_MONTHS + 2) / 5
                        + inputDay
-                       - SDN_OFFSET);
+                       - GREGOR_SDN_OFFSET);
 }
 
 char *MonthNameShort[13] =
index d93eb4c28288e835b4d31ac170559aa4bb105168..504f3c2d939a373f11dbca3346a2d620f4c0a629 100644 (file)
 #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 @@ void SdnToJewish(
        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 @@ long int JewishToSdn(
                                        return (0);
                        }
        }
-       return (sdn + SDN_OFFSET);
+       return (sdn + JEWISH_SDN_OFFSET);
 }
 
 /*