From: Lou Berger <lberger@labn.net>
Date: Tue, 10 Jul 2018 20:02:58 +0000 (-0400)
Subject: lib: remove VERSION_TYPE_DEV from CONFDATE checks
X-Git-Tag: frr-6.1-dev~156^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=308fea4ced2923a8988ad473e26662d56010a5ee;p=mirror%2Ffrr.git

lib: remove VERSION_TYPE_DEV from CONFDATE checks

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/lib/linklist.h b/lib/linklist.h
index 1e2631ea46..cee6c1e505 100644
--- a/lib/linklist.h
+++ b/lib/linklist.h
@@ -232,7 +232,7 @@ extern void list_sort(struct list *list,
  * and remove list_delete_original and the list_delete #define
  * Additionally remove list_free entirely
  */
-#if defined(VERSION_TYPE_DEV) && CONFDATE > 20181001
+#if CONFDATE > 20181001
 CPP_NOTICE("list_delete without double pointer is deprecated, please fixup")
 #endif
 
diff --git a/lib/stream.h b/lib/stream.h
index 11af85c663..e808f039c6 100644
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -133,7 +133,7 @@ struct stream_fifo {
 #define STREAM_CONCAT_REMAIN(S1, S2, size) ((size) - (S1)->endp - (S2)->endp)
 
 /* deprecated macros - do not use in new code */
-#if defined(VERSION_TYPE_DEV) && CONFDATE > 20181128
+#if CONFDATE > 20181128
 CPP_NOTICE("lib: time to remove deprecated stream.h macros")
 #endif
 #define STREAM_PNT(S)   stream_pnt((S))
diff --git a/lib/workqueue.h b/lib/workqueue.h
index 6085820393..fe1700f8de 100644
--- a/lib/workqueue.h
+++ b/lib/workqueue.h
@@ -154,7 +154,7 @@ extern struct work_queue *work_queue_new(struct thread_master *, const char *);
  * The usage of work_queue_free is being transitioned to pass
  * in the double pointer to remove use after free's.
  */
-#if defined(VERSION_TYPE_DEV) && CONFDATE > 20190205
+#if CONFDATE > 20190205
 CPP_NOTICE("work_queue_free without double pointer is deprecated, please fixup")
 #endif
 extern void work_queue_free_and_null(struct work_queue **);
diff --git a/lib/zclient.h b/lib/zclient.h
index ad98b8db87..10a1723010 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -457,7 +457,7 @@ struct zclient_options {
 extern struct zclient *zclient_new(struct thread_master *);
 
 /* clang-format off */
-#if defined(VERSION_TYPE_DEV) && CONFDATE > 20181101
+#if CONFDATE > 20181101
 CPP_NOTICE("zclient_new_notify can take over or zclient_new now");
 #endif
 /* clang-format on */
@@ -598,7 +598,7 @@ extern void zebra_interface_if_set_value(struct stream *, struct interface *);
 extern void zebra_router_id_update_read(struct stream *s, struct prefix *rid);
 
 /* clang-format off */
-#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180823
+#if CONFDATE > 20180823
 CPP_NOTICE("zapi_ipv4_route, zapi_ipv6_route, zapi_ipv4_route_ipv6_nexthop as well as the zapi_ipv4 and zapi_ipv6 data structures should be removed now");
 #endif
 /* clang-format on */