texlive[46697] Build/source/texk/kpathsea: revert lib.h.

[commits+kakuto at tug.org]

Revision: 46697
          http://tug.org/svn/texlive?view=revision&revision=46697
Author:   kakuto
Date:     2018-02-21 10:40:24 +0100 (Wed, 21 Feb 2018)
Log Message:
-----------
revert lib.h. replace LIB_FATAL2 by FATAL2 in xgetcwd.c

Modified Paths:
--------------
    trunk/Build/source/texk/kpathsea/ChangeLog
    trunk/Build/source/texk/kpathsea/lib.h
    trunk/Build/source/texk/kpathsea/xgetcwd.c

Modified: trunk/Build/source/texk/kpathsea/ChangeLog
===================================================================
--- trunk/Build/source/texk/kpathsea/ChangeLog	2018-02-21 08:15:23 UTC (rev 46696)
+++ trunk/Build/source/texk/kpathsea/ChangeLog	2018-02-21 09:40:24 UTC (rev 46697)
@@ -1,6 +1,6 @@
 2018-02-21  Akira Kakuto  <kakuto at 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 at freefriends.org>

Modified: trunk/Build/source/texk/kpathsea/lib.h
===================================================================
--- trunk/Build/source/texk/kpathsea/lib.h	2018-02-21 08:15:23 UTC (rev 46696)
+++ trunk/Build/source/texk/kpathsea/lib.h	2018-02-21 09:40:24 UTC (rev 46697)
@@ -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 @@
 #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 ()

Modified: trunk/Build/source/texk/kpathsea/xgetcwd.c
===================================================================
--- trunk/Build/source/texk/kpathsea/xgetcwd.c	2018-02-21 08:15:23 UTC (rev 46696)
+++ trunk/Build/source/texk/kpathsea/xgetcwd.c	2018-02-21 09:40:24 UTC (rev 46697)
@@ -117,7 +117,7 @@
             }
         }
         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);