aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2018-02-27 09:09:33 -0800
committerPaul Eggert2018-02-27 09:09:59 -0800
commitb38cb1495d8916ce70785a33fb4dacf64edc904b (patch)
tree540ce7f59a1df8518bddeb53ca81e905f6752b84
parent18ff4be3ea9b402b38a904352f0c819397842c3c (diff)
downloademacs-b38cb1495d8916ce70785a33fb4dacf64edc904b.tar.gz
emacs-b38cb1495d8916ce70785a33fb4dacf64edc904b.zip
Update from gnulib
This includes: 2018-02-27 environ: fix link error on 32-bit Cygwin * doc/misc/texinfo.tex, lib/unistd.in.h: Copy from gnulib.
-rw-r--r--doc/misc/texinfo.tex2
-rw-r--r--lib/unistd.in.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index c614e024058..0af2f09b527 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -3,7 +3,7 @@
3% Load plain if necessary, i.e., if running under initex. 3% Load plain if necessary, i.e., if running under initex.
4\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi 4\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
5% 5%
6\def\texinfoversion{2018-01-09.11} 6\def\texinfoversion{2018-02-24.16}
7% 7%
8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 8% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 9% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 13f4bb6cd16..beeb8e1d6fd 100644
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -400,7 +400,7 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - "
400 400
401 401
402#if @GNULIB_ENVIRON@ 402#if @GNULIB_ENVIRON@
403# if defined __CYGWIN__ 403# if defined __CYGWIN__ && !defined __i386__
404/* The 'environ' variable is defined in a DLL. Therefore its declaration needs 404/* The 'environ' variable is defined in a DLL. Therefore its declaration needs
405 the '__declspec(dllimport)' attribute, but the system's <unistd.h> lacks it. 405 the '__declspec(dllimport)' attribute, but the system's <unistd.h> lacks it.
406 This leads to a link error on 64-bit Cygwin when the option 406 This leads to a link error on 64-bit Cygwin when the option