Stop using newly-deprecated dosname Gnulib module

Code is supposed to use the filename module now.
* admin/merge-gnulib (GNULIB_MODULES): Replace dosname with filename.
* lib/dosname.h: Remove this forwarding stub.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib-src/emacsclient.c, src/fileio.c:
Include filename.h instead of dosname.h.

2 files changed, 1 insertions, 28 deletions

diff --git a/lib/dosname.h b/lib/dosname.h
deleted file mode 100644
index 490e0c5a7dd..00000000000
--- a/lib/dosname.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* File names on MS-DOS/Windows systems.
-
-   Copyright (C) 2000-2001, 2004-2006, 2009-2020 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
-
-#include "filename.h"
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 256bda7752e..0c7c2fb2b66 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -86,7 +86,6 @@
 #  crypto/sha512-buffer \
 #  d-type \
 #  diffseq \
-#  dosname \
 #  double-slash-root \
 #  dtoastr \
 #  dtotimespec \
@@ -100,6 +99,7 @@
 #  fcntl-h \
 #  fdopendir \
 #  filemode \
+#  filename \
 #  filevercmp \
 #  flexmember \
 #  fpieee \
@@ -1452,15 +1452,6 @@ EXTRA_libgnu_a_SOURCES += dirfd.c
 endif
 ## end   gnulib module dirfd
 
-## begin gnulib module dosname
-ifeq (,$(OMIT_GNULIB_MODULE_dosname))
-
-
-EXTRA_DIST += dosname.h
-
-endif
-## end   gnulib module dosname
-
 ## begin gnulib module dtoastr
 ifeq (,$(OMIT_GNULIB_MODULE_dtoastr))