Commit eaca0446 authored by Paul Eggert's avatar Paul Eggert

Merge from gnulib.

This incorporates:
2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
2013-08-10 sys_time: port to OpenBSD
parent 808190e6
2013-08-12 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
2013-08-10 sys_time: port to OpenBSD
2013-08-12 Glenn Morris <rgm@gnu.org> 2013-08-12 Glenn Morris <rgm@gnu.org>
* configure.ac (etcdocdir): Rename from docdir, to avoid confusion * configure.ac (etcdocdir): Rename from docdir, to avoid confusion
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex. % Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
% %
\def\texinfoversion{2013-06-23.10} \def\texinfoversion{2013-08-09.09}
% %
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
...@@ -2377,8 +2377,10 @@ ...@@ -2377,8 +2377,10 @@
\ifx\next,% \ifx\next,%
\else\ifx\next-% \else\ifx\next-%
\else\ifx\next.% \else\ifx\next.%
\else\ifx\next\.%
\else\ifx\next\comma%
\else\ptexslash \else\ptexslash
\fi\fi\fi \fi\fi\fi\fi\fi
\aftersmartic \aftersmartic
} }
...@@ -2519,7 +2521,9 @@ ...@@ -2519,7 +2521,9 @@
\ifx\codedashprev\codedash \ifx\codedashprev\codedash
\else \discretionary{}{}{}\fi \else \discretionary{}{}{}\fi
\fi \fi
\global\let\codedashprev=\next % we need the space after the = for the case when \next itself is a
% space token; it would get swallowed otherwise. As in @code{- a}.
\global\let\codedashprev= \next
} }
} }
\def\normaldash{-} \def\normaldash{-}
......
...@@ -20,11 +20,10 @@ ...@@ -20,11 +20,10 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#if HAVE_STDIO_EXT_H
# include <stdio_ext.h>
#endif
#if HAVE_DECL___FPENDING #ifndef __fpending
# if HAVE_STDIO_EXT_H
# include <stdio_ext.h>
# endif
#else
size_t __fpending (FILE *); size_t __fpending (FILE *);
#endif #endif
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
#endif #endif
@PRAGMA_COLUMNS@ @PRAGMA_COLUMNS@
/* On Cygwin, <sys/time.h> includes itself recursively via <sys/select.h>. /* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
recursively via <sys/select.h>.
Simply delegate to the system's header in this case; it is a no-op. Simply delegate to the system's header in this case; it is a no-op.
Without this extra ifdef, the C++ gettimeofday declaration below Without this extra ifdef, the C++ gettimeofday declaration below
would be a forward declaration in gnulib's nested <sys/time.h>. */ would be a forward declaration in gnulib's nested <sys/time.h>. */
#ifdef _CYGWIN_SYS_TIME_H #if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
#else #else
......
# serial 19 # serial 20
# Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc. # Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
...@@ -16,14 +16,19 @@ dnl we have to grub around in the FILE struct. ...@@ -16,14 +16,19 @@ dnl we have to grub around in the FILE struct.
AC_DEFUN([gl_FUNC_FPENDING], AC_DEFUN([gl_FUNC_FPENDING],
[ [
AC_CHECK_HEADERS_ONCE([stdio_ext.h]) AC_CHECK_HEADERS_ONCE([stdio_ext.h])
AC_CHECK_FUNCS_ONCE([__fpending]) AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending],
fp_headers=' [
# include <stdio.h> AC_LINK_IFELSE(
# if HAVE_STDIO_EXT_H [AC_LANG_PROGRAM(
# include <stdio_ext.h> [[#include <stdio.h>
# endif #if HAVE_STDIO_EXT_H
' # include <stdio_ext.h>
AC_CHECK_DECLS([__fpending], , , $fp_headers) #endif
]],
[[return ! __fpending (stdin);]])],
[gl_cv_func___fpending=yes],
[gl_cv_func___fpending=no])
])
]) ])
AC_DEFUN([gl_PREREQ_FPENDING], AC_DEFUN([gl_PREREQ_FPENDING],
......
...@@ -216,7 +216,7 @@ AC_DEFUN([gl_INIT], ...@@ -216,7 +216,7 @@ AC_DEFUN([gl_INIT],
gl_MODULE_INDICATOR([fdopendir]) gl_MODULE_INDICATOR([fdopendir])
gl_FILEMODE gl_FILEMODE
gl_FUNC_FPENDING gl_FUNC_FPENDING
if test $ac_cv_func___fpending = no; then if test $gl_cv_func___fpending = no; then
AC_LIBOBJ([fpending]) AC_LIBOBJ([fpending])
gl_PREREQ_FPENDING gl_PREREQ_FPENDING
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment