diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-05-10 22:57:10 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-05-10 22:57:10 +0400 |
| commit | 1563f79fa86aa3c5d9eae96e7e662a314c37928c (patch) | |
| tree | 3a9c0993746854569e645fd4ed00ff016496dda0 /winsup/cygwin/libc | |
| parent | 12b830981ec7ce2f78c5f70d9227ae3294cba54d (diff) | |
* Makefile.in (DLL_OFILES): Remove _def_time.o.
* libc/_def_time.c: Remove. Move definitions of _DefaultTimeLocale
and _CurrentTimeLocale ...
* libc/strptime.cc: ... here.
Diffstat (limited to 'winsup/cygwin/libc')
| -rw-r--r-- | winsup/cygwin/libc/_def_time.c | 42 | ||||
| -rw-r--r-- | winsup/cygwin/libc/strptime.cc | 29 |
2 files changed, 27 insertions, 44 deletions
diff --git a/winsup/cygwin/libc/_def_time.c b/winsup/cygwin/libc/_def_time.c deleted file mode 100644 index 40dc16102..000000000 --- a/winsup/cygwin/libc/_def_time.c +++ /dev/null @@ -1,42 +0,0 @@ -/* $NetBSD: _def_time.c,v 1.9 2007/03/28 19:05:53 manu Exp $ */ - -/* - * Written by J.T. Conklin <jtc@NetBSD.org>. - * Public domain. - */ - -#include <sys/cdefs.h> -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: _def_time.c,v 1.9 2007/03/28 19:05:53 manu Exp $"); -#endif /* LIBC_SCCS and not lint */ - -#include <sys/localedef.h> -#include <locale.h> - -_TimeLocale _DefaultTimeLocale = -{ - { - "Sun","Mon","Tue","Wed","Thu","Fri","Sat", - }, - { - "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", - "Friday", "Saturday" - }, - { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" - }, - { - "January", "February", "March", "April", "May", "June", "July", - "August", "September", "October", "November", "December" - }, - { - "AM", "PM" - }, - "%a %b %e %H:%M:%S %Y", - "%m/%d/%y", - "%H:%M:%S", - "%I:%M:%S %p" -}; - -_TimeLocale *_CurrentTimeLocale = &_DefaultTimeLocale; diff --git a/winsup/cygwin/libc/strptime.cc b/winsup/cygwin/libc/strptime.cc index 3bed5ea87..e2f710ae9 100644 --- a/winsup/cygwin/libc/strptime.cc +++ b/winsup/cygwin/libc/strptime.cc @@ -63,8 +63,33 @@ typedef struct { const char *t_fmt_ampm; } _TimeLocale; -extern _TimeLocale *_CurrentTimeLocale; -extern _TimeLocale _DefaultTimeLocale; +_TimeLocale _DefaultTimeLocale = +{ + { + "Sun","Mon","Tue","Wed","Thu","Fri","Sat", + }, + { + "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", + "Friday", "Saturday" + }, + { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" + }, + { + "January", "February", "March", "April", "May", "June", "July", + "August", "September", "October", "November", "December" + }, + { + "AM", "PM" + }, + "%a %b %e %H:%M:%S %Y", + "%m/%d/%y", + "%H:%M:%S", + "%I:%M:%S %p" +}; + +_TimeLocale *_CurrentTimeLocale = &_DefaultTimeLocale; #endif #define _ctloc(x) (_CurrentTimeLocale->x) |