From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 27 Feb 2018 17:09:33 +0000 (-0800)
Subject: Update from gnulib
X-Git-Tag: emacs-27.0.90~5612
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b38cb1495d8916ce70785a33fb4dacf64edc904b;p=emacs.git

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.
---

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 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2018-01-09.11}
+\def\texinfoversion{2018-02-24.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 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 - "
 
 
 #if @GNULIB_ENVIRON@
-# if defined __CYGWIN__
+# if defined __CYGWIN__ && !defined __i386__
 /* The 'environ' variable is defined in a DLL. Therefore its declaration needs
    the '__declspec(dllimport)' attribute, but the system's <unistd.h> lacks it.
    This leads to a link error on 64-bit Cygwin when the option