Update after gnulib changed.

* gnulib-local/lib/clean-temp.c.diff: Remove file.
* gnulib-local/Makefile.am (EXTRA_DIST): Remove it.
* gettext-tools/src/write-csharp.c (msgdomain_write_csharp): Update fopen_temp
invocation.
* gettext-tools/src/write-java.c (msgdomain_write_java): Likewise.

diff --git a/.gitignore b/.gitignore
index b9482405191eb65c6f25b5177c33f39dd09b3b14..51257162c4798e77d9889df3f304694a0568ea48 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,7 @@
 /gettext-tools/libgettextpo/asprintf.c
 /gettext-tools/libgettextpo/attribute.h
 /gettext-tools/libgettextpo/basename-lgpl.c
+/gettext-tools/libgettextpo/basename-lgpl.h
 /gettext-tools/libgettextpo/basename.c
 /gettext-tools/libgettextpo/basename.h
 /gettext-tools/libgettextpo/c-ctype.c

diff --git a/gettext-tools/src/write-csharp.c b/gettext-tools/src/write-csharp.c
index 52e32d8e2a09dd6e9fa31a1c2a2a7a66425658a1..1a238da79f5b972f751d2dac066f2e3d9a73a825 100644 (file)
--- a/gettext-tools/src/write-csharp.c
+++ b/gettext-tools/src/write-csharp.c
@@ -1,5 +1,5 @@
 /* Writing C# satellite assemblies.
-   Copyright (C) 2003-2010, 2016, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010, 2016, 2018-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -738,7 +738,7 @@ msgdomain_write_csharp (message_list_ty *mlp, const char *canon_encoding,
 
   /* Create the C# file.  */
   register_temp_file (tmpdir, csharp_file_name);
-  csharp_file = fopen_temp (csharp_file_name, "w");
+  csharp_file = fopen_temp (csharp_file_name, "w", false);
   if (csharp_file == NULL)
     {
       error (0, errno, _("failed to create \"%s\""), csharp_file_name);

diff --git a/gettext-tools/src/write-java.c b/gettext-tools/src/write-java.c
index 68e0e3a732145b3c0d1d549968fa94f29d797669..0b0b13216c8348decf3ec68473bb232af7aa2882 100644 (file)
--- a/gettext-tools/src/write-java.c
+++ b/gettext-tools/src/write-java.c
@@ -1,5 +1,5 @@
 /* Writing Java ResourceBundles.
-   Copyright (C) 2001-2003, 2005-2010, 2014, 2016, 2018-2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2010, 2014, 2016, 2018-2020 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -1187,7 +1187,7 @@ msgdomain_write_java (message_list_ty *mlp, const char *canon_encoding,
 
   /* Create the Java file.  */
   register_temp_file (tmpdir, java_file_name);
-  java_file = fopen_temp (java_file_name, "w");
+  java_file = fopen_temp (java_file_name, "w", false);
   if (java_file == NULL)
     {
       error (0, errno, _("failed to create \"%s\""), java_file_name);

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 04d0a6fd4b66b2e0e2bde75e1ee86761aa6ad32b..f89e003f52b5dec997e47ca00c93563e3c75277e 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -26,7 +26,6 @@ lib/backupfile.c \
 lib/backupfile.h \
 lib/basename.c \
 lib/basename.h \
-lib/clean-temp.c.diff \
 lib/closeout.c \
 lib/closeout.h \
 lib/diffseq.h.diff \

diff --git a/gnulib-local/lib/clean-temp.c.diff b/gnulib-local/lib/clean-temp.c.diff
deleted file mode 100644 (file)
index 2eafde6..0000000
--- a/gnulib-local/lib/clean-temp.c.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git i/lib/clean-temp.c w/lib/clean-temp.c
-index 40ec02f..1053312 100644
---- i/lib/clean-temp.c
-+++ w/lib/clean-temp.c
-@@ -582,6 +582,9 @@ static bool
- supports_delete_on_close ()
- {
-   static int known; /* 1 = yes, -1 = no, 0 = unknown */
-+  /* M4 wants to close and later reopen a temporary file, so
-+     delete-on-close must not be used.  */
-+  known = -1;
-   if (!known)
-     {
-       OSVERSIONINFO v;

diff --git a/libtextstyle/.gitignore b/libtextstyle/.gitignore
index 64f4a1fcd995e4b899ff9737f103e771eb3293fa..acafa2111376ff8644bb79b3588c4451e530469c 100644 (file)
--- a/libtextstyle/.gitignore
+++ b/libtextstyle/.gitignore
@@ -24,6 +24,7 @@
 /lib/asprintf.c
 /lib/attribute.h
 /lib/basename-lgpl.c
+/lib/basename-lgpl.h
 /lib/binary-io.c
 /lib/binary-io.h
 /lib/c++defs.h
@@ -86,6 +87,7 @@
 /lib/glib/
 /lib/glib.in.h
 /lib/glibconfig.in.h
+/lib/glthread/
 /lib/html-ostream.oo.c
 /lib/html-ostream.oo.h
 /lib/html-styled-ostream.oo.c
@@ -214,6 +216,15 @@
 /lib/w32sock.h
 /lib/warn-on-use.h
 /lib/wchar.in.h
+/lib/windows-initguard.h
+/lib/windows-mutex.c
+/lib/windows-mutex.h
+/lib/windows-once.c
+/lib/windows-once.h
+/lib/windows-recmutex.c
+/lib/windows-recmutex.h
+/lib/windows-rwlock.c
+/lib/windows-rwlock.h
 /lib/write.c
 /lib/xalloc-oversized.h
 /lib/xalloc.h