Commit 4f41188a authored by Paul Eggert's avatar Paul Eggert

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.
parent a775dca4
Pipeline #5110 passed with stage
in 51 minutes and 57 seconds
......@@ -31,10 +31,10 @@ GNULIB_MODULES='
careadlinkat close-stream copy-file-range
count-leading-zeros count-one-bits count-trailing-zeros
crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
d-type diffseq dosname double-slash-root dtoastr dtotimespec dup2
d-type diffseq double-slash-root dtoastr dtotimespec dup2
environ execinfo explicit_bzero faccessat
fchmodat fcntl fcntl-h fdopendir
filemode filevercmp flexmember fpieee fstatat fsusage fsync futimens
filemode filename filevercmp flexmember fpieee fstatat fsusage fsync futimens
getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
ieee754-h ignore-value intprops largefile lstat
manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime nstrftime
......
......@@ -80,7 +80,7 @@ char *w32_getenv (const char *);
#include <sys/stat.h>
#include <unistd.h>
#include <dosname.h>
#include <filename.h>
#include <intprops.h>
#include <min-max.h>
#include <pathmax.h>
......
/* 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"
......@@ -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))
......
......@@ -69,7 +69,6 @@ AC_DEFUN([gl_EARLY],
# Code from module diffseq:
# Code from module dirent:
# Code from module dirfd:
# Code from module dosname:
# Code from module double-slash-root:
# Code from module dtoastr:
# Code from module dtotimespec:
......@@ -962,7 +961,6 @@ AC_DEFUN([gl_FILE_LIST], [
lib/diffseq.h
lib/dirent.in.h
lib/dirfd.c
lib/dosname.h
lib/dtoastr.c
lib/dtotimespec.c
lib/dup2.c
......
......@@ -96,7 +96,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include <acl.h>
#include <allocator.h>
#include <careadlinkat.h>
#include <dosname.h>
#include <filename.h>
#include <fsusage.h>
#include <stat-time.h>
#include <tempname.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment