From: Lou Berger <lberger@labn.net>
Date: Tue, 3 Apr 2018 17:44:46 +0000 (-0400)
Subject: *: Only test CONFDATE when VERSION_TYPE_DEV defined
X-Git-Tag: frr-4.0.1~18^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=18e72c6609738b94b3216afce3be2d4e1997d433;p=matthieu%2Ffrr.git

*: Only test CONFDATE when VERSION_TYPE_DEV defined

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

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 63f3ccfc91..874af821b1 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8299,7 +8299,7 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, u_char use_json,
 			uptime -= p->uptime;
 			epoch_tbuf = time(NULL) - uptime;
 
-#if CONFDATE > 20200101
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20200101
 			CPP_NOTICE("bgpTimerUp should be deprecated and can be removed now");
 #endif
 			/*
diff --git a/lib/linklist.h b/lib/linklist.h
index 8a43fbe64b..fa83183161 100644
--- a/lib/linklist.h
+++ b/lib/linklist.h
@@ -84,7 +84,7 @@ extern void *listnode_head(struct list *);
  * and remove list_delete_original and the list_delete #define
  * Additionally remove list_free entirely
  */
-#if CONFDATE > 20181001
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20181001
 CPP_NOTICE("list_delete without double pointer is deprecated, please fixup")
 #endif
 extern void list_delete_and_null(struct list **);
diff --git a/lib/stream.h b/lib/stream.h
index 4d387f9564..0aece965d5 100644
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -123,7 +123,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 CONFDATE > 20181128
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20181128
 CPP_NOTICE("lib: time to remove deprecated stream.h macros")
 #endif
 #define STREAM_PNT(S)   stream_pnt((S))
diff --git a/lib/vty.h b/lib/vty.h
index 3b75afb02c..20105049cc 100644
--- a/lib/vty.h
+++ b/lib/vty.h
@@ -189,7 +189,7 @@ struct vty_arg {
 /* Integrated configuration file. */
 #define INTEGRATE_DEFAULT_CONFIG "frr.conf"
 
-#if CONFDATE > 20180401
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180401
 CPP_NOTICE("It's probably time to remove VTY_NEWLINE compatibility foo.")
 #endif
 
diff --git a/lib/zclient.h b/lib/zclient.h
index df9e5f438d..a232f322c4 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -353,7 +353,7 @@ struct zclient_options {
 /* Prototypes of zebra client service functions. */
 extern struct zclient *zclient_new(struct thread_master *);
 
-#if CONFDATE > 20181101
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20181101
 CPP_NOTICE("zclient_new_notify can take over or zclient_new now");
 #endif
 
@@ -422,7 +422,7 @@ extern struct interface *zebra_interface_vrf_update_read(struct stream *s,
 extern void zebra_interface_if_set_value(struct stream *, struct interface *);
 extern void zebra_router_id_update_read(struct stream *s, struct prefix *rid);
 
-#if CONFDATE > 20180823
+#if defined(VERSION_TYPE_DEV) && 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
 
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 5d1144335b..3d938b2180 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -363,7 +363,7 @@ DEFUN(no_ospf6_router_id,
 	return CMD_SUCCESS;
 }
 
-#if CONFDATE > 20180828
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180828
 CPP_NOTICE("ospf6: `router-id A.B.C.D` deprecated 2017/08/28")
 #endif
 ALIAS_HIDDEN(ospf6_router_id,
@@ -372,7 +372,7 @@ ALIAS_HIDDEN(ospf6_router_id,
 	     "Configure OSPF6 Router-ID\n"
 	     V4NOTATION_STR)
 
-#if CONFDATE > 20180828
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180828
 CPP_NOTICE("ospf6: `no router-id A.B.C.D` deprecated 2017/08/28")
 #endif
 ALIAS_HIDDEN(no_ospf6_router_id,
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 1276f5477c..7eb68775d1 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2337,7 +2337,7 @@ DEFUN (no_ospf_timers_lsa_min_arrival,
 	return CMD_SUCCESS;
 }
 
-#if CONFDATE > 20180708
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180708
 CPP_NOTICE("ospf: `timers lsa arrival (0-1000)` deprecated 2017/07/08")
 #endif
 ALIAS_HIDDEN (ospf_timers_lsa_min_arrival,
@@ -2348,7 +2348,7 @@ ALIAS_HIDDEN (ospf_timers_lsa_min_arrival,
               "ospf minimum arrival interval delay\n"
               "delay (msec) between accepted lsas\n");
 
-#if CONFDATE > 20180708
+#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180708
 CPP_NOTICE("ospf: `no timers lsa arrival (0-1000)` deprecated 2017/07/08")
 #endif
 ALIAS_HIDDEN (no_ospf_timers_lsa_min_arrival,