diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-03-28 13:50:02 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-03-28 14:08:11 -0700 |
| commit | a775dca449ca8da2e2619ea608a3849f70fa951e (patch) | |
| tree | 3fa6063075ef683bba7f5a4074c7d92b4080042f /lib/dosname.h | |
| parent | dceba13ce57ed0cb726e89566197f77359a38d91 (diff) | |
| download | emacs-a775dca449ca8da2e2619ea608a3849f70fa951e.tar.gz emacs-a775dca449ca8da2e2619ea608a3849f70fa951e.tar.bz2 emacs-a775dca449ca8da2e2619ea608a3849f70fa951e.zip | |
Update from Gnulib
This incorporates:
2020-03-28 Use module 'filename' instead of module 'dosname'
2020-03-28 dosname: Redirect to 'filename'
* lib/at-func.c, lib/canonicalize-lgpl.c, lib/dosname.h:
Copy from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/filename.h: New file, copied from Gnulib.
Diffstat (limited to 'lib/dosname.h')
| -rw-r--r-- | lib/dosname.h | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/lib/dosname.h b/lib/dosname.h index 57829600948..490e0c5a7dd 100644 --- a/lib/dosname.h +++ b/lib/dosname.h @@ -13,40 +13,6 @@ 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/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. */ - From Paul Eggert and Jim Meyering. */ - -#ifndef _DOSNAME_H -#define _DOSNAME_H - -#if (defined _WIN32 || defined __CYGWIN__ \ - || defined __EMX__ || defined __MSDOS__ || defined __DJGPP__) - /* This internal macro assumes ASCII, but all hosts that support drive - letters use ASCII. */ -# define _IS_DRIVE_LETTER(C) (((unsigned int) (C) | ('a' - 'A')) - 'a' \ - <= 'z' - 'a') -# define FILE_SYSTEM_PREFIX_LEN(Filename) \ - (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0) -# ifndef __CYGWIN__ -# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 1 -# endif -# define ISSLASH(C) ((C) == '/' || (C) == '\\') -#else -# define FILE_SYSTEM_PREFIX_LEN(Filename) 0 -# define ISSLASH(C) ((C) == '/') -#endif - -#ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE -# define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0 -#endif - -#if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE -# define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)]) -# else -# define IS_ABSOLUTE_FILE_NAME(F) \ - (ISSLASH ((F)[0]) || FILE_SYSTEM_PREFIX_LEN (F) != 0) -#endif -#define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F)) - -#endif /* DOSNAME_H_ */ +#include "filename.h" |