maint: adjust to split out xstrtol-error gnulib module

* bootstrap.conf: Depend on the new module split from xstrtol.
* src/df.c: Include "xstrtol-error.h" for xstrtol_fatal.
* src/du.c: Likewise.
* src/ls.c: Likewise.
* src/od.c: Likewise.
* src/pr.c: Likewise.
* src/sort.c: Likewise.

diff --git a/bootstrap.conf b/bootstrap.conf
index 4a1458f49236cef716aaa97dba3c0831ecf6f34d..0406a8b1243e25562f8bb6549231a218dfeb83a2 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -298,6 +298,7 @@ gnulib_modules="
   xstrtod
   xstrtoimax
   xstrtol
+  xstrtol-error
   xstrtold
   xstrtoumax
   year2038

diff --git a/src/df.c b/src/df.c
index 61c51caaefc2ff2976c862b7b8774fcf85620d96..5fa1a5856278815b18ce48c92ef4b7b465c1ce2f 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -39,6 +39,7 @@
 #include "quote.h"
 #include "find-mount-point.h"
 #include "hash.h"
+#include "xstrtol-error.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "df"

diff --git a/src/du.c b/src/du.c
index ce8372254abf30ec77907d2842bf2ac02a7f0577..3f5ada35451e318a329382bdcf61025530d6797b 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -43,6 +43,7 @@
 #include "stdio--.h"
 #include "xfts.h"
 #include "xstrtol.h"
+#include "xstrtol-error.h"
 
 extern bool fts_debug;
 

diff --git a/src/ls.c b/src/ls.c
index 3d30e067086e32542ebe5efbc409d0e0c17cc0c3..c3555f45ce1b1e2f80fba1178fc38d60cfabf11e 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -108,6 +108,7 @@
 #include "strftime.h"
 #include "xdectoint.h"
 #include "xstrtol.h"
+#include "xstrtol-error.h"
 #include "areadlink.h"
 #include "mbsalign.h"
 #include "dircolors.h"

diff --git a/src/od.c b/src/od.c
index e754be6e509949220238370644d287f799415f73..200bc16cc27ee84cdb08b07254ee3c1becfe2d3c 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -32,6 +32,7 @@
 #include "xbinary-io.h"
 #include "xprintf.h"
 #include "xstrtol.h"
+#include "xstrtol-error.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "od"

diff --git a/src/pr.c b/src/pr.c
index 14259e30d8abea5902dea73081242887718e7a1b..160608276ad38f647b1feb1616d6da00ce4e91a9 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -322,6 +322,7 @@
 #include "stdio--.h"
 #include "strftime.h"
 #include "xstrtol.h"
+#include "xstrtol-error.h"
 #include "xdectoint.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */

diff --git a/src/sort.c b/src/sort.c
index 6d11aff1922854ffa1bca70c69698e432e862a8f..329ed45dc8f818e9e5a99d17d1d34b0c806843bf 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -53,6 +53,7 @@
 #include "xmemcoll.h"
 #include "xnanosleep.h"
 #include "xstrtol.h"
+#include "xstrtol-error.h"
 
 #ifndef RLIMIT_DATA
 struct rlimit { size_t rlim_cur; };