diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-12-24 14:47:31 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-12-24 14:49:08 -0800 |
| commit | 1013adf6bf48627f84a9043cf2631ff13d2a452f (patch) | |
| tree | b41c188f9695443ee347e28fef75e52529ad683b /lib/canonicalize-lgpl.c | |
| parent | 6f600ec73085df142211bf8505083dcdd59859bb (diff) | |
| download | gnulib-1013adf6bf48627f84a9043cf2631ff13d2a452f.tar.gz | |
canonicalize-lgpl: merge proposed libc changes
This merges the changes proposed for glibc in:
https://sourceware.org/pipermail/libc-alpha/2020-December/121085.html
https://sourceware.org/pipermail/libc-alpha/2020-December/121086.html
* lib/canonicalize-lgpl.c: Include idx.h and filename.h
unconditionally.
(idx_t, IDX_MAX, FILE_SYSTEM_PREFIX_LEN, IS_ABSOLUTE_FILE_NAME)
(ISSLASH) [_LIBC]: Remove.
Diffstat (limited to 'lib/canonicalize-lgpl.c')
| -rw-r--r-- | lib/canonicalize-lgpl.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c index d6dd18dcff..8c8f98abc4 100644 --- a/lib/canonicalize-lgpl.c +++ b/lib/canonicalize-lgpl.c @@ -38,15 +38,12 @@ #include <unistd.h> #include <eloop-threshold.h> +#include <idx.h> +#include <filename.h> #include <scratch_buffer.h> #ifdef _LIBC # include <shlib-compat.h> -typedef ptrdiff_t idx_t; -# define IDX_MAX PTRDIFF_MAX -# define FILE_SYSTEM_PREFIX_LEN(name) 0 -# define IS_ABSOLUTE_FILE_NAME(name) ISSLASH (*(name)) -# define ISSLASH(c) ((c) == '/') # include <sysdep.h> # ifdef __ASSUME_FACCESSAT2 # define FACCESSAT_NEVER_EOVERFLOWS __ASSUME_FACCESSAT2 @@ -56,9 +53,7 @@ typedef ptrdiff_t idx_t; #else # define __canonicalize_file_name canonicalize_file_name # define __realpath realpath -# include "idx.h" # include "pathmax.h" -# include "filename.h" # define __faccessat faccessat # if defined _WIN32 && !defined __CYGWIN__ # define __getcwd _getcwd |