>From a49ce1bbe6013e82491f13612310d571a9f9139d Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 24 Dec 2020 11:38:48 -0800
Subject: [PATCH 07/10] canonicalize-lgpl: use eloop-threshold

* lib/canonicalize-lgpl.c [!_LIBC]: Include eloop-threshold.h.
(MAXSYMLINKS, __eloop_threshold): Remove.
* modules/canonicalize-lgpl (Depends-on): Add eloop-threshold.
---
 ChangeLog                 |  5 +++++
 lib/canonicalize-lgpl.c   | 10 +---------
 modules/canonicalize-lgpl |  1 +
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b119360f3..edca84874 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2020-12-24  Paul Eggert  <eggert@cs.ucla.edu>
 
+	canonicalize-lgpl: use eloop-threshold
+	* lib/canonicalize-lgpl.c [!_LIBC]: Include eloop-threshold.h.
+	(MAXSYMLINKS, __eloop_threshold): Remove.
+	* modules/canonicalize-lgpl (Depends-on): Add eloop-threshold.
+
 	eloop-threshold: new module
 	* config/srclist.txt: Add a comment about it.
 	* lib/eloop-threshold.h, modules/eloop-threshold: New files.
diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index 3d4218516..c6cb50630 100644
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -37,10 +37,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include <eloop-threshold.h>
 #include <scratch_buffer.h>
 
 #ifdef _LIBC
-# include <eloop-threshold.h>
 # include <shlib-compat.h>
 typedef ptrdiff_t idx_t;
 # define IDX_MAX PTRDIFF_MAX
@@ -85,14 +85,6 @@ typedef ptrdiff_t idx_t;
 # define __rawmemchr rawmemchr
 # define __readlink readlink
 # define __stat stat
-# ifndef MAXSYMLINKS
-#  ifdef SYMLOOP_MAX
-#   define MAXSYMLINKS SYMLOOP_MAX
-#  else
-#   define MAXSYMLINKS 20
-#  endif
-# endif
-# define __eloop_threshold() MAXSYMLINKS
 #endif
 
 #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl
index dfad9202f..b5f3e7f69 100644
--- a/modules/canonicalize-lgpl
+++ b/modules/canonicalize-lgpl
@@ -13,6 +13,7 @@ extensions
 stdlib
 nocrash
 double-slash-root [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
+eloop-threshold   [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 errno             [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 fcntl-h           [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
 filename          [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1]
-- 
2.27.0