diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-02-21 09:40:24 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2018-02-21 09:40:24 +0000 |
| commit | 76f11c729a8066c70167e6fe628a2e14abeebeff (patch) | |
| tree | da753ee4cfb6cf6da1f17b82e29f686142f2795b /Build | |
| parent | 84446472e9cb4e966d9ff5aaf2bd447a8ffe8abc (diff) | |
revert lib.h. replace LIB_FATAL2 by FATAL2 in xgetcwd.c
git-svn-id: svn://tug.org/texlive/trunk@46697 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 2 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/lib.h | 9 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/xgetcwd.c | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 123ff223ae7..f2a0ce396fe 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,6 +1,6 @@ 2018-02-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - * lib.h: Fix a bug in LIB_START_FATAL(). + * xgetcwd.c: Replace LIB_FATAL2 by FATAL2. Private report from Douglas McKenna, 2018/02/21. 2018-02-20 Karl Berry <karl@freefriends.org> diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h index 9592a4790c5..df380f654d6 100644 --- a/Build/source/texk/kpathsea/lib.h +++ b/Build/source/texk/kpathsea/lib.h @@ -1,7 +1,7 @@ /* lib.h: declarations for common, low-level routines in kpathsea. Copyright 1992, 1993, 1994, 1995, 1996, 2008, 2009, 2010, 2011, - 2012, 2015, 2018 Karl Berry. + 2012, 2015 Karl Berry. Copyright 1999, 2000, 2003, 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -87,13 +87,8 @@ extern "C" { #define WARNING4(str, e1, e2, e3, e4) \ START_WARNING (); fprintf (stderr, str, e1, e2, e3, e4); END_WARNING () -#if defined (KPSE_COMPAT_API) -#define LIB_START_FATAL() do { \ - fprintf (stderr, "%s: fatal: ", kpse_def->invocation_name); -#else #define LIB_START_FATAL() do { \ - fprintf (stderr, "fatal: "); -#endif + fprintf (stderr, "%s: fatal: ", kpse->invocation_name); #define LIB_FATAL(str) \ LIB_START_FATAL (); fputs (str, stderr); END_FATAL () diff --git a/Build/source/texk/kpathsea/xgetcwd.c b/Build/source/texk/kpathsea/xgetcwd.c index 0e8392f7d0e..044731dbd1b 100644 --- a/Build/source/texk/kpathsea/xgetcwd.c +++ b/Build/source/texk/kpathsea/xgetcwd.c @@ -117,7 +117,7 @@ xgetcwd (void) } } if (!found) - LIB_FATAL2("No inode %d/device %d in parent directory", + FATAL2("No inode %d/device %d in parent directory", cwd_stat.st_ino, cwd_stat.st_dev); xclosedir(parent_dir); |