Consistency.

This commit is contained in:
Sebastian Bergmann 2002-02-02 19:33:36 +00:00
parent 4a2f0316e1
commit 5319d84400
2 changed files with 6 additions and 6 deletions

View File

@ -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] =

View File

@ -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);
}
/*