cvs: php4 /ext/calendar french.c julian.c
| From: | Sebastian Bergmann | Date: | Sat, 02 Feb 2002 19:33:36 +0000 |
| Subject: | cvs: php4 /ext/calendar french.c julian.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9243@lists.php.net to get a copy of this message | ||
sebastian Sat Feb 2 14:33:36 2002 EDT
Modified files:
/php4/ext/calendar french.c julian.c
Log:
Consistency.
Index: php4/ext/calendar/french.c
diff -u php4/ext/calendar/french.c:1.3 php4/ext/calendar/french.c:1.4
--- php4/ext/calendar/french.c:1.3 Sun Sep 9 09:28:39 2001
+++ php4/ext/calendar/french.c Sat Feb 2 14:33:36 2002
@@ -86,7 +86,7 @@
#include "sdncal.h"
-#define SDN_OFFSET 2375474
+#define FRENCH_SDN_OFFSET 2375474
#define DAYS_PER_4_YEARS 1461
#define DAYS_PER_MONTH 30
#define FIRST_VALID 2375840
@@ -107,7 +107,7 @@
*pDay = 0;
return;
}
- temp = (sdn - SDN_OFFSET) * 4 - 1;
+ temp = (sdn - FRENCH_SDN_OFFSET) * 4 - 1;
*pYear = temp / DAYS_PER_4_YEARS;
dayOfYear = (temp % DAYS_PER_4_YEARS) / 4;
*pMonth = dayOfYear / DAYS_PER_MONTH + 1;
@@ -128,7 +128,7 @@
return ((year * DAYS_PER_4_YEARS) / 4
+ (month - 1) * DAYS_PER_MONTH
+ day
- + SDN_OFFSET);
+ + FRENCH_SDN_OFFSET);
}
char *FrenchMonthName[14] =
Index: php4/ext/calendar/julian.c
diff -u php4/ext/calendar/julian.c:1.3 php4/ext/calendar/julian.c:1.4
--- php4/ext/calendar/julian.c:1.3 Sun Sep 9 09:28:39 2001
+++ php4/ext/calendar/julian.c Sat Feb 2 14:33:36 2002
@@ -147,7 +147,7 @@
#include "sdncal.h"
-#define SDN_OFFSET 32083
+#define JULIAN_SDN_OFFSET 32083
#define DAYS_PER_5_MONTHS 153
#define DAYS_PER_4_YEARS 1461
@@ -169,7 +169,7 @@
*pDay = 0;
return;
}
- temp = (sdn + SDN_OFFSET) * 4 - 1;
+ temp = (sdn + JULIAN_SDN_OFFSET) * 4 - 1;
/* Calculate the year and day of year (1 <= dayOfYear <= 366). */
year = temp / DAYS_PER_4_YEARS;
@@ -236,7 +236,7 @@
return ((year * DAYS_PER_4_YEARS) / 4
+ (month * DAYS_PER_5_MONTHS + 2) / 5
+ inputDay
- - SDN_OFFSET);
+ - JULIAN_SDN_OFFSET);
}
/*