From 12b830981ec7ce2f78c5f70d9227ae3294cba54d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 8 May 2008 14:58:11 +0000 Subject: [PATCH] * include/sys/localedef.h: Remove. * libc/strptime.cc: Define _TimeLocale and declare _CurrentTimeLocale as well as _DefaultTimeLocale locally for Cygwin. --- winsup/cygwin/ChangeLog | 6 ++ winsup/cygwin/include/sys/localedef.h | 100 -------------------------- winsup/cygwin/libc/strptime.cc | 19 ++++- 3 files changed, 24 insertions(+), 101 deletions(-) delete mode 100644 winsup/cygwin/include/sys/localedef.h diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 87e7f6d50..97e1b767a 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2008-05-08 Corinna Vinschen + + * include/sys/localedef.h: Remove. + * libc/strptime.cc: Define _TimeLocale and declare _CurrentTimeLocale + as well as _DefaultTimeLocale locally for Cygwin. + 2008-05-08 Corinna Vinschen * Makefile.in (DLL_OFILES): Add _def_time.o. Remove timelocal.o. diff --git a/winsup/cygwin/include/sys/localedef.h b/winsup/cygwin/include/sys/localedef.h deleted file mode 100644 index 6af264988..000000000 --- a/winsup/cygwin/include/sys/localedef.h +++ /dev/null @@ -1,100 +0,0 @@ -/* $NetBSD: localedef.h,v 1.8 2007/03/30 15:55:38 he Exp $ */ - -/* - * Copyright (c) 1994 Winning Strategies, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Winning Strategies, Inc. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _SYS_LOCALEDEF_H_ -#define _SYS_LOCALEDEF_H_ - -typedef struct { - const char *yesexpr; - const char *noexpr; - const char *yesstr; - const char *nostr; -} _MessagesLocale; - -extern const _MessagesLocale *_CurrentMessagesLocale; -extern const _MessagesLocale _DefaultMessagesLocale; - - -typedef struct { - const char *int_curr_symbol; - const char *currency_symbol; - const char *mon_decimal_point; - const char *mon_thousands_sep; - const char *mon_grouping; - const char *positive_sign; - const char *negative_sign; - char int_frac_digits; - char frac_digits; - char p_cs_precedes; - char p_sep_by_space; - char n_cs_precedes; - char n_sep_by_space; - char p_sign_posn; - char n_sign_posn; - char int_p_cs_precedes; - char int_n_cs_precedes; - char int_p_sep_by_space; - char int_n_sep_by_space; - char int_p_sign_posn; - char int_n_sign_posn; -} _MonetaryLocale; - -extern const _MonetaryLocale *_CurrentMonetaryLocale; -extern const _MonetaryLocale _DefaultMonetaryLocale; - - -typedef struct { - const char *decimal_point; - const char *thousands_sep; - const char *grouping; -} _NumericLocale; - -extern const _NumericLocale *_CurrentNumericLocale; -extern const _NumericLocale _DefaultNumericLocale; - - -typedef struct { - const char *abday[7]; - const char *day[7]; - const char *abmon[12]; - const char *mon[12]; - const char *am_pm[2]; - const char *d_t_fmt; - const char *d_fmt; - const char *t_fmt; - const char *t_fmt_ampm; -} _TimeLocale; - -extern _TimeLocale *_CurrentTimeLocale; -extern _TimeLocale _DefaultTimeLocale; - -#endif /* !_SYS_LOCALEDEF_H_ */ diff --git a/winsup/cygwin/libc/strptime.cc b/winsup/cygwin/libc/strptime.cc index d0a77a850..3bed5ea87 100644 --- a/winsup/cygwin/libc/strptime.cc +++ b/winsup/cygwin/libc/strptime.cc @@ -38,8 +38,8 @@ __RCSID("$NetBSD: strptime.c,v 1.28 2008/04/28 20:23:01 martin Exp $"); #include "winsup.h" #else #include "namespace.h" -#endif #include +#endif #include #include #include @@ -50,6 +50,23 @@ __RCSID("$NetBSD: strptime.c,v 1.28 2008/04/28 20:23:01 martin Exp $"); __weak_alias(strptime,_strptime) #endif +#ifdef __CYGWIN__ +typedef struct { + const char *abday[7]; + const char *day[7]; + const char *abmon[12]; + const char *mon[12]; + const char *am_pm[2]; + const char *d_t_fmt; + const char *d_fmt; + const char *t_fmt; + const char *t_fmt_ampm; +} _TimeLocale; + +extern _TimeLocale *_CurrentTimeLocale; +extern _TimeLocale _DefaultTimeLocale; +#endif + #define _ctloc(x) (_CurrentTimeLocale->x) /* -- 2.43.5