Merge pull request #5653 from slankdev/slankdev-bgpd-support-prefix-sid-srv6-l3vpn

[mirror_frr.git] / ospf6d / ospf6d.h

diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h
index 1515c3ad0c9a814a8c0e3536e0cf97de4185b274..36f3c2233f77a8dced09fd94d240da8a1c55c622 100644 (file)
--- a/ospf6d/ospf6d.h
+++ b/ospf6d/ospf6d.h
@@ -21,8 +21,6 @@
 #ifndef OSPF6D_H
 #define OSPF6D_H
 
-#define OSPF6_DAEMON_VERSION    "0.9.7r"
-
 #include "libospf.h"
 #include "thread.h"
 
@@ -74,12 +72,12 @@ extern struct thread_master *master;
 
 #define threadtimer_string(now, t, buf, size)                                  \
        do {                                                                   \
-               struct timeval result;                                         \
+               struct timeval _result;                                        \
                if (!t)                                                        \
                        snprintf(buf, size, "inactive");                       \
                else {                                                         \
-                       timersub(&t->u.sands, &now, &result);                  \
-                       timerstring(&result, buf, size);                       \
+                       timersub(&t->u.sands, &now, &_result);                 \
+                       timerstring(&_result, buf, size);                      \
                }                                                              \
        } while (0)
 
@@ -96,6 +94,7 @@ extern struct thread_master *master;
                return CMD_SUCCESS;                                            \
        }
 
+extern struct zebra_privs_t ospf6d_privs;
 
 /* Function Prototypes */
 extern struct route_node *route_prev(struct route_node *node);