diff --git a/src/system/libroot/posix/time/Jamfile b/src/system/libroot/posix/time/Jamfile index ea40f94fb4..b1de2b4a73 100644 --- a/src/system/libroot/posix/time/Jamfile +++ b/src/system/libroot/posix/time/Jamfile @@ -1,7 +1,7 @@ SubDir HAIKU_TOP src system libroot posix time ; # for localtime.c strftime.c -SubDirCcFlags -DNOID -DTZDIR='\"/etc/timezones\"' -DUSG_COMPAT -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DPCTS=1 ; +SubDirCcFlags -DNOID -DTZDIR='\"/etc/timezones\"' -DUSG_COMPAT -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DPCTS=1 -DSTD_INSPIRED ; UsePrivateHeaders [ FDirName libroot time ] ; UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ; @@ -14,8 +14,8 @@ MergeObject posix_time.o : localtime.c stime.c strftime.c -# strptime.c -# timelocal.c + strptime.c + timelocal.c time.c ; diff --git a/src/system/libroot/posix/time/timelocal.c b/src/system/libroot/posix/time/timelocal.c index 7dba4cdf2f..e457e48ff7 100644 --- a/src/system/libroot/posix/time/timelocal.c +++ b/src/system/libroot/posix/time/timelocal.c @@ -29,9 +29,9 @@ #include "timelocal.h" +#if 0 static struct lc_time_T _time_locale; static int _time_using_locale; -#if 0 static char *time_locale_buf; #endif @@ -100,9 +100,13 @@ static const struct lc_time_T _C_time_locale = { struct lc_time_T * __get_current_time_locale(void) { - return (_time_using_locale + return +#if 0 + (_time_using_locale ? &_time_locale - : (struct lc_time_T *)&_C_time_locale); + : +#endif + (struct lc_time_T *)&_C_time_locale; } #if 0