CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-17 09:06:50 +02:00
Code Issues Projects Releases Wiki Activity

Sync from gnulib.

Browse Source
This commit is contained in:
Paul Eggert
2004-11-09 20:54:43 +00:00
parent 3b9295c319
commit 443e4a9026
2 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/strftime.c
+3 -2
View File
@@ -1,4 +1,5 @@
/* Copyright (C) 1991-1999, 2000, 2001, 2003 Free Software Foundation, Inc.
/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004 Free Software
Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -56,7 +57,7 @@ extern char *tzname[];
conversion specifications. The GNU C Library uses UTF8 multibyte
encoding, which is safe for formats, but strftime.c can be used
with other C libraries that use unsafe encodings. */
#define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE)
#define DO_MULTIBYTE (HAVE_MBLEN && HAVE_WCHAR_H && ! MULTIBYTE_IS_FORMAT_SAFE)
#if DO_MULTIBYTE
# if HAVE_MBRLEN
m4/strftime.m4
+34 -27
View File
@@ -1,39 +1,46 @@
#serial 22
#serial 23
dnl This macro is intended to be used solely in this file.
dnl These are the prerequisite macros for GNU's strftime.c replacement.
AC_DEFUN([_gl_STRFTIME_PREREQS],
[
dnl strftime.c uses the underyling system strftime if it exists.
AC_FUNC_STRFTIME
# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004
# Free Software Foundation, Inc.
AC_CHECK_FUNCS_ONCE(mempcpy)
AC_CHECK_FUNCS(tzset)
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
AC_STRUCT_TIMEZONE
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
AC_CHECK_FUNCS(mblen mbrlen)
AC_TYPE_MBSTATE_T
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
AC_REQUIRE([gl_TM_GMTOFF])
AC_REQUIRE([gl_FUNC_TZSET_CLOBBER])
# Written by Jim Meyering and Paul Eggert.
AC_DEFUN([gl_FUNC_GNU_STRFTIME],
[AC_REQUIRE([gl_FUNC_STRFTIME])dnl
AC_REQUIRE([AC_C_CONST])dnl
])
dnl From Jim Meyering.
dnl
AC_DEFUN([gl_FUNC_GNU_STRFTIME],
[AC_REQUIRE([AC_HEADER_TIME])dnl
# These are the prerequisite macros for GNU's strftime.c replacement.
AC_DEFUN([gl_FUNC_STRFTIME],
[
# strftime.c uses the underyling system strftime if it exists.
AC_REQUIRE([AC_FUNC_STRFTIME])
_gl_STRFTIME_PREREQS
# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE.
AC_REQUIRE([AC_STRUCT_TIMEZONE])
AC_REQUIRE([AC_HEADER_TIME])
AC_REQUIRE([AC_TYPE_MBSTATE_T])
AC_REQUIRE([gl_TM_GMTOFF])
AC_REQUIRE([gl_FUNC_TZSET_CLOBBER])
AC_CHECK_FUNCS_ONCE(mblen mbrlen mempcpy tzset)
AC_CHECK_HEADERS_ONCE(sys/time.h wchar.h)
AC_REQUIRE([AC_C_CONST])dnl
AC_CHECK_HEADERS_ONCE(sys/time.h)
AC_DEFINE([my_strftime], [nstrftime],
[Define to the name of the strftime replacement function.])
])
AC_DEFUN([gl_FUNC_STRFTIME],
[
_gl_STRFTIME_PREREQS
])