summaryrefslogtreecommitdiff
path: root/ext/calendar
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@php.net>2002-02-02 19:33:36 +0000
committerSebastian Bergmann <sebastian@php.net>2002-02-02 19:33:36 +0000
commit5319d84400eea07027d4ddda847559c09b536bf4 (patch)
treeacd50a85f1472cdf1a405a0ea709ca371b908363 /ext/calendar
parent4a2f0316e162f956fa798f5a154bb1308a5f7519 (diff)
downloadphp-git-5319d84400eea07027d4ddda847559c09b536bf4.tar.gz
Consistency.
Diffstat (limited to 'ext/calendar')
-rw-r--r--ext/calendar/french.c6
-rw-r--r--ext/calendar/julian.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/calendar/french.c b/ext/calendar/french.c
index f2882a5e5e..5b4dd53750 100644
--- a/ext/calendar/french.c
+++ b/ext/calendar/french.c
@@ -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 @@ void SdnToFrench(
*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 @@ long int FrenchToSdn(
return ((year * DAYS_PER_4_YEARS) / 4
+ (month - 1) * DAYS_PER_MONTH
+ day
- + SDN_OFFSET);
+ + FRENCH_SDN_OFFSET);
}
char *FrenchMonthName[14] =
diff --git a/ext/calendar/julian.c b/ext/calendar/julian.c
index 20da0403f6..39bcbc7e65 100644
--- a/ext/calendar/julian.c
+++ b/ext/calendar/julian.c
@@ -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 @@ void SdnToJulian(
*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 @@ long int JulianToSdn(
return ((year * DAYS_PER_4_YEARS) / 4
+ (month * DAYS_PER_5_MONTHS + 2) / 5
+ inputDay
- - SDN_OFFSET);
+ - JULIAN_SDN_OFFSET);
}
/*