Remove USE_DOUBLE_LIST from build options

diff --git a/Make.inc.in b/Make.inc.in
index 263f7ee48588a0b9a1e9a35130ddb89b32f5dfb3..31b1588348fac2566371ca0e46bcb71d0a8d9754 100644 (file)
--- 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 1e9690dd1a20f0b85b90c2174bd2c22fb28ff470..cbbc59c953f7cdebb7328556047934ded76f10db 100644 (file)
--- 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 dedcfee60c39a3c609b12f007dbba4c6d3c2ff1c..05312c3f0a4767f498b0446f0929938791f5375c 100644 (file)
--- 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 \