* include/sys/localedef.h: Remove.
* libc/strptime.cc: Define _TimeLocale and declare _CurrentTimeLocale as well as _DefaultTimeLocale locally for Cygwin.
This commit is contained in:
Corinna Vinschen
parent
72d1a8a04a
commit
12b830981e
|
|
@ -1,3 +1,9 @@
|
||||||
|
2008-05-08 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
|
* 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 <corinna@vinschen.de>
|
2008-05-08 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* Makefile.in (DLL_OFILES): Add _def_time.o. Remove timelocal.o.
|
* Makefile.in (DLL_OFILES): Add _def_time.o. Remove timelocal.o.
|
||||||
|
|
|
||||||
|
|
@ -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_ */
|
|
||||||
|
|
@ -38,8 +38,8 @@ __RCSID("$NetBSD: strptime.c,v 1.28 2008/04/28 20:23:01 martin Exp $");
|
||||||
#include "winsup.h"
|
#include "winsup.h"
|
||||||
#else
|
#else
|
||||||
#include "namespace.h"
|
#include "namespace.h"
|
||||||
#endif
|
|
||||||
#include <sys/localedef.h>
|
#include <sys/localedef.h>
|
||||||
|
#endif
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
@ -50,6 +50,23 @@ __RCSID("$NetBSD: strptime.c,v 1.28 2008/04/28 20:23:01 martin Exp $");
|
||||||
__weak_alias(strptime,_strptime)
|
__weak_alias(strptime,_strptime)
|
||||||
#endif
|
#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)
|
#define _ctloc(x) (_CurrentTimeLocale->x)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue