Merge branch 'frr/pull/213' ("*: remove QUAGGA_NO_DEPRECATED_INTERFACES")

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

2 files changed, 0 insertions, 19 deletions

diff --git a/configure.ac b/configure.ac
index 1436b2fc7c..b1d9a1b691 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1651,14 +1651,6 @@ AC_SUBST(CFG_SYSCONF)
 AC_SUBST(CFG_SBIN)
 AC_SUBST(CFG_STATE)
 
-dnl -------------------------------
-dnl Quagga sources should always be 
-dnl current wrt interfaces. Dont
-dnl allow deprecated interfaces to
-dnl be exposed.
-dnl -------------------------------
-AC_DEFINE(QUAGGA_NO_DEPRECATED_INTERFACES, 1, Hide deprecated interfaces)
-
 dnl ---------------------------
 dnl Check htonl works correctly
 dnl ---------------------------
diff --git a/lib/linklist.h b/lib/linklist.h
index 052025a86c..cd6e2f13aa 100644
--- a/lib/linklist.h
+++ b/lib/linklist.h
@@ -135,15 +135,4 @@ extern void list_add_list (struct list *, struct list *);
     (L)->count--; \
   } while (0)
 
-/* Deprecated: 20050406 */
-#if !defined(QUAGGA_NO_DEPRECATED_INTERFACES)
-#warning "Using deprecated libfrr interfaces"
-#define LISTNODE_ADD(L,N) LISTNODE_ATTACH(L,N)
-#define LISTNODE_DELETE(L,N) LISTNODE_DETACH(L,N)
-#define nextnode(X) ((X) = (X)->next)
-#define getdata(X) listgetdata(X)
-#define LIST_LOOP(L,V,N) \
-  for (ALL_LIST_ELEMENTS_RO (L,N,V))
-#endif /* QUAGGA_NO_DEPRECATED_INTERFACES */
-
 #endif /* _ZEBRA_LINKLIST_H */