calendar tweak for 64bit code

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36494 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-04-08 16:21:57 +00:00
parent a081b3d828
commit 5f111ccdbf

View file

@ -79,8 +79,8 @@ typedef struct {
NSString *localeID;
NSTimeZone *tz;
void *cal;
int32_t firstWeekday;
int32_t minimumDaysInFirstWeek;
NSInteger firstWeekday;
NSInteger minimumDaysInFirstWeek;
} Calendar;
#define my ((Calendar*)_NSCalendarInternal)
#define aac ((Calendar*)(autoupdatingCalendar->_NSCalendarInternal))
@ -133,7 +133,7 @@ typedef struct {
else
{
ucal_setAttribute(my->cal, UCAL_FIRST_DAY_OF_WEEK,
my->firstWeekday);
(int32_t)my->firstWeekday);
}
if (NSNotFound == my->minimumDaysInFirstWeek)
@ -144,7 +144,7 @@ typedef struct {
else
{
ucal_setAttribute(my->cal, UCAL_MINIMAL_DAYS_IN_FIRST_WEEK,
my->minimumDaysInFirstWeek);
(int32_t)my->minimumDaysInFirstWeek);
}
#endif
@ -531,7 +531,7 @@ static NSRecursiveLock *classLock = nil;
- (void) setFirstWeekday: (NSUInteger)weekday
{
my->firstWeekday = (int32_t)weekday;
my->firstWeekday = weekday;
#if GS_USE_ICU == 1
ucal_setAttribute (my->cal, UCAL_FIRST_DAY_OF_WEEK, my->firstWeekday);
#endif