From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 25 Jan 2021 11:33:13 +0000 (+0000)
Subject: Remove USE_DOUBLE_LIST from build options
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d45e7f4da5008c47ce5326f8f0783b59ecf2fd7e;p=thirdparty%2Ffreeradius-server.git

Remove USE_DOUBLE_LIST from build options
---

diff --git a/Make.inc.in b/Make.inc.in
index 263f7ee485..31b1588348 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -165,8 +165,6 @@ $(error OPENSSL_LIBS must be define in order to use WITH_OPENSSL_*)
 endif
 endif
 
-CFLAGS += -DUSE_DOUBLE_LIST
-
 # Path to clang, setting this enables the 'scan.*' build targets
 # which perform static analysis on various server components.
 ANALYZE.c       := @clang_path@
diff --git a/src/lib/util/cursor.h b/src/lib/util/cursor.h
index 1e9690dd1a..cbbc59c953 100644
--- a/src/lib/util/cursor.h
+++ b/src/lib/util/cursor.h
@@ -20,9 +20,6 @@
  *
  * @copyright 2016 The FreeRADIUS server project
  */
-#ifdef USE_DOUBLE_LIST
-#include <freeradius-devel/util/dcursor.h>
-#endif
 RCSIDH(cursor_h, "$Id$")
 
 #ifdef __cplusplus
diff --git a/src/lib/util/libfreeradius-util.mk b/src/lib/util/libfreeradius-util.mk
index dedcfee60c..05312c3f0a 100644
--- a/src/lib/util/libfreeradius-util.mk
+++ b/src/lib/util/libfreeradius-util.mk
@@ -20,6 +20,8 @@ SOURCES		:= \
 		   dict_util.c \
 		   dict_validate.c \
 		   dl.c \
+		   dpair.c \
+		   dpair_legacy.c \
 		   dns.c \
 		   event.c \
 		   ext.c \
@@ -43,8 +45,6 @@ SOURCES		:= \
 		   missing.c \
 		   net.c \
 		   packet.c \
-		   $(if $(findstring USE_DOUBLE_LIST,$(CFLAGS)),dpair.c,pair.c) \
-		   $(if $(findstring USE_DOUBLE_LIST,$(CFLAGS)),dpair_legacy.c,pair_legacy.c) \
 		   pair_print.c \
 		   pair_tokenize.c \
 		   paths.c \