From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 1 Jan 2020 14:36:12 +0000 (+0000)
Subject: maint: adjust to split out xstrtol-error gnulib module
X-Git-Tag: v8.32~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff2f85273ad6254391cdd36198b78d6d5542f4ab;p=thirdparty%2Fcoreutils.git

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 4a1458f492..0406a8b124 100644
--- 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 61c51caaef..5fa1a58562 100644
--- 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 ce8372254a..3f5ada3545 100644
--- 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 3d30e06708..c3555f45ce 100644
--- 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 e754be6e50..200bc16cc2 100644
--- 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 14259e30d8..160608276a 100644
--- 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 6d11aff192..329ed45dc8 100644
--- 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; };