[Emacs-diffs] master 2cfb32b 1/2: Fix the MS-Windows build

[Eli Zaretskii]

branch: master
commit 2cfb32bf4cbb726b83db82e414acced03781f99d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix the MS-Windows build
    
    * nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_open): Omit Gnulib module
    'open'.
    
    * lib-src/etags.c (O_CLOEXEC) [WINDOWSNT]: Restore definition.
---
 lib-src/etags.c  | 2 ++
 nt/gnulib-cfg.mk | 1 +
 2 files changed, 3 insertions(+)

diff --git a/lib-src/etags.c b/lib-src/etags.c
index bec61a8..5e05c19 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -111,6 +111,8 @@ char pot_etags_version[] = "@(#) pot revision number is 
17.38.1.4";
 # undef HAVE_NTGUI
 # undef  DOS_NT
 # define DOS_NT
+/* The WINDOWSNT build doesn't use Gnulib's fcntl.h.  */
+# define O_CLOEXEC O_NOINHERIT
 #endif /* WINDOWSNT */
 
 #include <limits.h>
diff --git a/nt/gnulib-cfg.mk b/nt/gnulib-cfg.mk
index d2b96f9..b75e36f 100644
--- a/nt/gnulib-cfg.mk
+++ b/nt/gnulib-cfg.mk
@@ -50,6 +50,7 @@ OMIT_GNULIB_MODULE_dirfd = true
 OMIT_GNULIB_MODULE_fcntl = true
 OMIT_GNULIB_MODULE_fcntl-h = true
 OMIT_GNULIB_MODULE_inttypes-incomplete = true
+OMIT_GNULIB_MODULE_open = true
 OMIT_GNULIB_MODULE_pipe2 = true
 OMIT_GNULIB_MODULE_secure_getenv = true
 OMIT_GNULIB_MODULE_signal-h = true