*: Convert event.h to frrevent.h

We should probably prevent any type of namespace collision
with something else.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

babeld/babel_main.c

@@ -8,7 +8,7 @@ Copyright 2011 by Matthieu Boutier and Juliusz Chroboczek
 #include "getopt.h"
 #include "if.h"
 #include "log.h"
-#include "event.h"
+#include "frrevent.h"
 #include "privs.h"
 #include "sigevent.h"
 #include "lib/version.h"

babeld/kernel.c

@@ -29,7 +29,7 @@ Copyright 2011, 2012 by Matthieu Boutier and Juliusz Chroboczek
 #include "command.h"
 #include "vty.h"
 #include "memory.h"
-#include "event.h"
+#include "frrevent.h"
 #include "nexthop.h"
 
 #include "util.h"

bfdd/dplane.c

@@ -26,7 +26,7 @@
 #include "lib/network.h"
 #include "lib/printfrr.h"
 #include "lib/stream.h"
-#include "lib/event.h"
+#include "lib/frrevent.h"
 
 #include "bfd.h"
 #include "bfddp_packet.h"

bgpd/bgp_advertise.c

@@ -9,7 +9,7 @@
 #include "memory.h"
 #include "prefix.h"
 #include "hash.h"
-#include "event.h"
+#include "frrevent.h"
 #include "queue.h"
 #include "filter.h"
 

bgpd/bgp_bfd.c

@@ -11,7 +11,7 @@
 #include "linklist.h"
 #include "memory.h"
 #include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
 #include "buffer.h"
 #include "stream.h"
 #include "vrf.h"

bgpd/bgp_bmp.c

@@ -11,7 +11,7 @@
 #include "sockunion.h"
 #include "command.h"
 #include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
 #include "linklist.h"
 #include "queue.h"
 #include "pullwr.h"

bgpd/bgp_damp.c

@@ -10,7 +10,7 @@
 #include "memory.h"
 #include "command.h"
 #include "log.h"
-#include "event.h"
+#include "frrevent.h"
 #include "queue.h"
 #include "filter.h"
 

bgpd/bgp_dump.c

@@ -10,7 +10,7 @@
 #include "sockunion.h"
 #include "command.h"
 #include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
 #include "linklist.h"
 #include "queue.h"
 #include "memory.h"

bgpd/bgp_fsm.c

@@ -9,7 +9,7 @@
 #include "linklist.h"
 #include "prefix.h"
 #include "sockunion.h"
-#include "event.h"
+#include "frrevent.h"
 #include "log.h"
 #include "stream.h"
 #include "ringbuf.h"

bgpd/bgp_io.c

@@ -17,7 +17,7 @@
 #include "network.h"		// for ERRNO_IO_RETRY
 #include "stream.h"		// for stream_get_endp, stream_getw_from, str...
 #include "ringbuf.h"		// for ringbuf_remain, ringbuf_peek, ringbuf_...
-#include "event.h"		// for EVENT_OFF, EVENT_ARG, thread...
+#include "frrevent.h"		// for EVENT_OFF, EVENT_ARG, thread...
 
 #include "bgpd/bgp_io.h"
 #include "bgpd/bgp_debug.h"	// for bgp_debug_neighbor_events, bgp_type_str

bgpd/bgp_label.c

@@ -6,7 +6,7 @@
 #include <zebra.h>
 
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "prefix.h"
 #include "zclient.h"
 #include "stream.h"

bgpd/bgp_main.c

@@ -9,7 +9,7 @@
 #include "vector.h"
 #include "command.h"
 #include "getopt.h"
-#include "event.h"
+#include "frrevent.h"
 #include <lib/version.h>
 #include "memory.h"
 #include "prefix.h"

bgpd/bgp_mplsvpn_snmp.c

@@ -12,7 +12,7 @@
 #include "log.h"
 #include "prefix.h"
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "smux.h"
 #include "filter.h"
 #include "hook.h"

bgpd/bgp_network.c

@@ -5,7 +5,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "sockunion.h"
 #include "sockopt.h"
 #include "memory.h"

bgpd/bgp_nexthop.c

@@ -6,7 +6,7 @@
 #include <zebra.h>
 
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "prefix.h"
 #include "lib/json.h"
 #include "zclient.h"

bgpd/bgp_nht.c

@@ -6,7 +6,7 @@
 #include <zebra.h>
 
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "prefix.h"
 #include "zclient.h"
 #include "stream.h"

bgpd/bgp_open.c

@@ -8,7 +8,7 @@
 #include "linklist.h"
 #include "prefix.h"
 #include "stream.h"
-#include "event.h"
+#include "frrevent.h"
 #include "log.h"
 #include "command.h"
 #include "memory.h"

bgpd/bgp_packet.c

@@ -8,7 +8,7 @@
 #include <zebra.h>
 #include <sys/time.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "stream.h"
 #include "network.h"
 #include "prefix.h"

bgpd/bgp_route.c

@@ -20,7 +20,7 @@
 #include "buffer.h"
 #include "sockunion.h"
 #include "plist.h"
-#include "event.h"
+#include "frrevent.h"
 #include "workqueue.h"
 #include "queue.h"
 #include "memory.h"

bgpd/bgp_rpki.c

@@ -23,7 +23,7 @@
 #include "command.h"
 #include "linklist.h"
 #include "memory.h"
-#include "event.h"
+#include "frrevent.h"
 #include "filter.h"
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_table.h"

bgpd/bgp_snmp.c

@@ -12,7 +12,7 @@
 #include "log.h"
 #include "prefix.h"
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "smux.h"
 #include "filter.h"
 #include "hook.h"

bgpd/bgp_snmp_bgp4.c

@@ -12,7 +12,7 @@
 #include "log.h"
 #include "prefix.h"
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "smux.h"
 #include "filter.h"
 #include "hook.h"

bgpd/bgp_snmp_bgp4v2.c

@@ -13,7 +13,7 @@
 #include "log.h"
 #include "prefix.h"
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "smux.h"
 #include "filter.h"
 #include "hook.h"

bgpd/bgp_updgrp.c

@@ -12,7 +12,7 @@
 #include <zebra.h>
 
 #include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
 #include "buffer.h"
 #include "stream.h"
 #include "command.h"

bgpd/bgp_updgrp_adv.c

@@ -17,7 +17,7 @@
 #include "memory.h"
 #include "prefix.h"
 #include "hash.h"
-#include "event.h"
+#include "frrevent.h"
 #include "queue.h"
 #include "routemap.h"
 #include "filter.h"

bgpd/bgp_updgrp_packet.c

@@ -12,7 +12,7 @@
 #include <zebra.h>
 
 #include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
 #include "buffer.h"
 #include "stream.h"
 #include "command.h"

bgpd/bgp_vty.c

@@ -16,7 +16,7 @@
 #include "buffer.h"
 #include "linklist.h"
 #include "stream.h"
-#include "event.h"
+#include "frrevent.h"
 #include "log.h"
 #include "memory.h"
 #include "lib_vty.h"

bgpd/bgp_zebra.c

@@ -13,7 +13,7 @@
 #include "sockunion.h"
 #include "zclient.h"
 #include "routemap.h"
-#include "event.h"
+#include "frrevent.h"
 #include "queue.h"
 #include "memory.h"
 #include "lib/json.h"

bgpd/bgpd.c

@@ -6,7 +6,7 @@
 #include <zebra.h>
 
 #include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
 #include "buffer.h"
 #include "stream.h"
 #include "ringbuf.h"

bgpd/rfapi/rfapi_import.c

@@ -15,7 +15,7 @@
 #include "lib/memory.h"
 #include "lib/log.h"
 #include "lib/skiplist.h"
-#include "event.h"
+#include "frrevent.h"
 #include "lib/stream.h"
 #include "lib/lib_errors.h"
 

bgpd/rfapi/rfapi_import.h

@@ -13,7 +13,7 @@
 #ifndef QUAGGA_HGP_RFAPI_IMPORT_H
 #define QUAGGA_HGP_RFAPI_IMPORT_H
 
-#include "event.h"
+#include "frrevent.h"
 
 /*
  * These are per-rt-import-list

bgpd/rfapi/vnc_export_table.h

@@ -9,7 +9,7 @@
 #define _QUAGGA_VNC_VNC_EXPORT_TABLE_H_
 
 #include "lib/table.h"
-#include "event.h"
+#include "frrevent.h"
 #include "lib/vty.h"
 
 #include "bgpd/bgpd.h"

doc/developer/modules.rst

@@ -56,7 +56,7 @@ Basic boilerplate:
     #include "hook.h"
     #include "module.h"
     #include "libfrr.h"
-    #include "event.h"
+    #include "frrevent.h"
 
     static int module_late_init(struct event_loop *master)
     {

eigrpd/eigrp_dump.c

@@ -13,7 +13,7 @@
 #include <zebra.h>
 
 #include "linklist.h"
-#include "event.h"
+#include "frrevent.h"
 #include "prefix.h"
 #include "command.h"
 #include "stream.h"

eigrpd/eigrp_filter.c

@@ -21,7 +21,7 @@
 #include "command.h"
 #include "prefix.h"
 #include "table.h"
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "log.h"
 #include "stream.h"

eigrpd/eigrp_fsm.c

@@ -54,7 +54,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "prefix.h"
 #include "table.h"
 #include "memory.h"

eigrpd/eigrp_hello.c

@@ -16,7 +16,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"

eigrpd/eigrp_interface.c

@@ -16,7 +16,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "linklist.h"
 #include "prefix.h"
 #include "if.h"

eigrpd/eigrp_main.c

@@ -17,7 +17,7 @@
 
 #include <lib/version.h>
 #include "getopt.h"
-#include "event.h"
+#include "frrevent.h"
 #include "prefix.h"
 #include "linklist.h"
 #include "if.h"

eigrpd/eigrp_neighbor.c

@@ -20,7 +20,7 @@
 #include "prefix.h"
 #include "memory.h"
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "stream.h"
 #include "table.h"
 #include "log.h"

eigrpd/eigrp_network.c

@@ -12,7 +12,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "linklist.h"
 #include "prefix.h"
 #include "if.h"

eigrpd/eigrp_packet.c

@@ -12,7 +12,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "vty.h"

eigrpd/eigrp_query.c

@@ -12,7 +12,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"

eigrpd/eigrp_reply.c

@@ -16,7 +16,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"

eigrpd/eigrp_siaquery.c

@@ -12,7 +12,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"

eigrpd/eigrp_siareply.c

@@ -11,7 +11,7 @@
  */
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"

eigrpd/eigrp_snmp.c

@@ -16,7 +16,7 @@
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"

eigrpd/eigrp_update.c

@@ -16,7 +16,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"

eigrpd/eigrp_vty.c

@@ -17,7 +17,7 @@
 #include <zebra.h>
 
 #include "memory.h"
-#include "event.h"
+#include "frrevent.h"
 #include "prefix.h"
 #include "table.h"
 #include "vty.h"

eigrpd/eigrp_zebra.c

@@ -12,7 +12,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "command.h"
 #include "network.h"
 #include "prefix.h"

eigrpd/eigrpd.c

@@ -12,7 +12,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "vty.h"
 #include "command.h"
 #include "linklist.h"

isisd/isis_adjacency.c

@@ -15,7 +15,7 @@
 #include "hash.h"
 #include "vty.h"
 #include "linklist.h"
-#include "event.h"
+#include "frrevent.h"
 #include "if.h"
 #include "stream.h"
 #include "bfd.h"

isisd/isis_circuit.c

@@ -19,7 +19,7 @@
 #include "if.h"
 #include "linklist.h"
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "vty.h"
 #include "hash.h"
 #include "prefix.h"

isisd/isis_csm.c

@@ -14,7 +14,7 @@
 #include "if.h"
 #include "linklist.h"
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "hash.h"
 #include "prefix.h"
 #include "stream.h"

isisd/isis_dr.c

@@ -13,7 +13,7 @@
 
 #include "log.h"
 #include "hash.h"
-#include "event.h"
+#include "frrevent.h"
 #include "linklist.h"
 #include "vty.h"
 #include "stream.h"

isisd/isis_dynhn.c

@@ -16,7 +16,7 @@
 #include "stream.h"
 #include "command.h"
 #include "if.h"
-#include "event.h"
+#include "frrevent.h"
 
 #include "isisd/isis_constants.h"
 #include "isisd/isis_common.h"

isisd/isis_events.c

@@ -13,7 +13,7 @@
 #include "if.h"
 #include "linklist.h"
 #include "command.h"
-#include "event.h"
+#include "frrevent.h"
 #include "hash.h"
 #include "prefix.h"
 #include "stream.h"

isisd/isis_ldp_sync.c

@@ -9,7 +9,7 @@
 
 #include "monotime.h"
 #include "memory.h"
-#include "event.h"
+#include "frrevent.h"
 #include "prefix.h"
 #include "table.h"
 #include "vty.h"

isisd/isis_lsp.c

@@ -12,7 +12,7 @@
 #include <zebra.h>
 
 #include "linklist.h"
-#include "event.h"
+#include "frrevent.h"
 #include "vty.h"
 #include "stream.h"
 #include "memory.h"

isisd/isis_main.c

@@ -10,7 +10,7 @@
 #include <zebra.h>
 
 #include "getopt.h"
-#include "event.h"
+#include "frrevent.h"
 #include "log.h"
 #include <lib/version.h>
 #include "command.h"

isisd/isis_pdu.c

@@ -11,7 +11,7 @@
 #include <zebra.h>
 
 #include "memory.h"
-#include "event.h"
+#include "frrevent.h"
 #include "linklist.h"
 #include "log.h"
 #include "stream.h"

isisd/isis_route.c

@@ -11,7 +11,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "linklist.h"
 #include "vty.h"
 #include "log.h"

isisd/isis_routemap.c

@@ -18,7 +18,7 @@
 #include "plist.h"
 #include "routemap.h"
 #include "table.h"
-#include "event.h"
+#include "frrevent.h"
 #include "vty.h"
 
 #include "isis_constants.h"

isisd/isis_spf.c

@@ -11,7 +11,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "linklist.h"
 #include "vty.h"
 #include "log.h"

isisd/isis_te.c

@@ -13,7 +13,7 @@
 #include <math.h>
 
 #include "linklist.h"
-#include "event.h"
+#include "frrevent.h"
 #include "vty.h"
 #include "stream.h"
 #include "memory.h"

isisd/isis_zebra.c

@@ -10,7 +10,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "command.h"
 #include "memory.h"
 #include "log.h"

isisd/isisd.c

@@ -9,7 +9,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "vty.h"
 #include "command.h"
 #include "log.h"

ldpd/ldpd.h

@@ -14,7 +14,7 @@
 #include "queue.h"
 #include "openbsd-tree.h"
 #include "imsg.h"
-#include "event.h"
+#include "frrevent.h"
 #include "qobj.h"
 #include "prefix.h"
 #include "filter.h"

lib/bfd.c

@@ -10,7 +10,7 @@
 #include "command.h"
 #include "memory.h"
 #include "prefix.h"
-#include "event.h"
+#include "frrevent.h"
 #include "stream.h"
 #include "vrf.h"
 #include "zclient.h"

lib/command.c

@@ -17,7 +17,7 @@
 #include "memory.h"
 #include "log.h"
 #include "log_vty.h"
-#include "event.h"
+#include "frrevent.h"
 #include "vector.h"
 #include "linklist.h"
 #include "vty.h"

lib/event.c

@@ -8,7 +8,7 @@
 #include <zebra.h>
 #include <sys/resource.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "frrcu.h"
 #include "log.h"

lib/frr_pthread.h

@@ -11,7 +11,7 @@
 #include "frratomic.h"
 #include "memory.h"
 #include "frrcu.h"
-#include "event.h"
+#include "frrevent.h"
 
 #ifdef __cplusplus
 extern "C" {

lib/frr_zmq.c

@@ -15,7 +15,7 @@
 #include <zebra.h>
 #include <zmq.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "frr_zmq.h"
 #include "log.h"

lib/frr_zmq.h

@@ -7,7 +7,7 @@
 #ifndef _FRRZMQ_H
 #define _FRRZMQ_H
 
-#include "event.h"
+#include "frrevent.h"
 #include <zmq.h>
 
 #ifdef __cplusplus

lib/frrevent.h

@@ -33,7 +33,7 @@ struct rusage_t {
 #endif
 	struct timeval real;
 };
-#define RUSAGE_T        struct rusage_t
+#define RUSAGE_T struct rusage_t
 
 #define GETRUSAGE(X) event_getrusage(X)
 
@@ -118,10 +118,10 @@ struct event {
 		struct timeval sands; /* rest of time sands value. */
 	} u;
 	struct timeval real;
-	struct cpu_event_history *hist;	 /* cache pointer to cpu_history */
+	struct cpu_event_history *hist;	    /* cache pointer to cpu_history */
-	unsigned long yield;		 /* yield time in microseconds */
+	unsigned long yield;		    /* yield time in microseconds */
 	const struct xref_eventsched *xref; /* origin location */
-	pthread_mutex_t mtx;   /* mutex for thread.c functions */
+	pthread_mutex_t mtx;		    /* mutex for thread.c functions */
 	bool ignore_timer_late;
 };
 

lib/ldp_sync.c

@@ -10,7 +10,7 @@
 #include "memory.h"
 #include "prefix.h"
 #include "log.h"
-#include "event.h"
+#include "frrevent.h"
 #include "stream.h"
 #include "zclient.h"
 #include "table.h"

lib/libfrr.h

@@ -11,7 +11,7 @@
 #include "typesafe.h"
 #include "sigevent.h"
 #include "privs.h"
-#include "event.h"
+#include "frrevent.h"
 #include "log.h"
 #include "getopt.h"
 #include "module.h"

lib/libfrr_trace.h

@@ -21,7 +21,7 @@
 #include <lttng/tracepoint.h>
 
 #include "hash.h"
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "linklist.h"
 #include "table.h"

lib/mgmt_fe_client.h

@@ -13,7 +13,7 @@ extern "C" {
 #endif
 
 #include "mgmt_pb.h"
-#include "event.h"
+#include "frrevent.h"
 #include "mgmtd/mgmt_defines.h"
 
 /***************************************************************

lib/mgmt_msg.c

@@ -10,7 +10,7 @@
 #include "network.h"
 #include "sockopt.h"
 #include "stream.h"
-#include "event.h"
+#include "frrevent.h"
 #include "mgmt_msg.h"
 
 

lib/mgmt_msg.h

@@ -8,7 +8,7 @@
 #define _MGMT_MSG_H
 
 #include "stream.h"
-#include "event.h"
+#include "frrevent.h"
 
 #define MGMT_MSG_MARKER (0x4D724B21u) /* ASCII - "MrK!"*/
 

lib/northbound.h

@@ -7,7 +7,7 @@
 #ifndef _FRR_NORTHBOUND_H_
 #define _FRR_NORTHBOUND_H_
 
-#include "event.h"
+#include "frrevent.h"
 #include "hook.h"
 #include "linklist.h"
 #include "openbsd-tree.h"

lib/northbound_grpc.cpp

@@ -12,7 +12,7 @@
 #include "log.h"
 #include "libfrr.h"
 #include "lib/version.h"
-#include "event.h"
+#include "frrevent.h"
 #include "command.h"
 #include "lib_errors.h"
 #include "northbound.h"

lib/pullwr.h

@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "stream.h"
 
 #ifdef __cplusplus

lib/qobj.c

@@ -7,7 +7,7 @@
 
 #include <zebra.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "hash.h"
 #include "log.h"

lib/resolver.c

@@ -12,7 +12,7 @@
 
 #include "typesafe.h"
 #include "jhash.h"
-#include "event.h"
+#include "frrevent.h"
 #include "lib_errors.h"
 #include "resolver.h"
 #include "command.h"

lib/resolver.h

@@ -6,7 +6,7 @@
 #ifndef _FRR_RESOLVER_H
 #define _FRR_RESOLVER_H
 
-#include "event.h"
+#include "frrevent.h"
 #include "sockunion.h"
 
 #ifdef __cplusplus

lib/sigevent.h

@@ -8,7 +8,7 @@
 #ifndef _FRR_SIGNAL_H
 #define _FRR_SIGNAL_H
 
-#include <event.h>
+#include <frrevent.h>
 
 #ifdef __cplusplus
 extern "C" {

lib/smux.h

@@ -9,7 +9,7 @@
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 #include <net-snmp/agent/snmp_vars.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "hook.h"
 
 #ifdef __cplusplus

lib/spf_backoff.c

@@ -17,7 +17,7 @@
 
 #include "command.h"
 #include "memory.h"
-#include "event.h"
+#include "frrevent.h"
 #include "vty.h"
 
 DEFINE_MTYPE_STATIC(LIB, SPF_BACKOFF, "SPF backoff");

lib/subdir.am

@@ -288,7 +288,7 @@ pkginclude_HEADERS += \
 	lib/systemd.h \
 	lib/table.h \
 	lib/termtable.h \
-	lib/event.h \
+	lib/frrevent.h \
 	lib/trace.h \
 	lib/typerb.h \
 	lib/typesafe.h \

lib/systemd.c

@@ -7,7 +7,7 @@
 #include <zebra.h>
 #include <sys/un.h>
 
-#include "event.h"
+#include "frrevent.h"
 #include "systemd.h"
 #include "lib_errors.h"
 

lib/vty.c

@@ -22,7 +22,7 @@
 #include <stdio.h>
 
 #include "linklist.h"
-#include "event.h"
+#include "frrevent.h"
 #include "buffer.h"
 #include "command.h"
 #include "sockunion.h"

lib/vty.h

@@ -18,7 +18,7 @@
 #include <regex.h>
 #endif /* HAVE_LIBPCRE2_POSIX */
 
-#include "event.h"
+#include "frrevent.h"
 #include "log.h"
 #include "sockunion.h"
 #include "qobj.h"

lib/wheel.c

@@ -6,7 +6,7 @@
  */
 #include "zebra.h"
 #include "linklist.h"
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "wheel.h"
 #include "log.h"

lib/workqueue.c

@@ -6,7 +6,7 @@
  */
 
 #include <zebra.h>
-#include "event.h"
+#include "frrevent.h"
 #include "memory.h"
 #include "workqueue.h"
 #include "linklist.h"

lib/zclient.c

@@ -14,7 +14,7 @@
 #include "vrf_int.h"
 #include "if.h"
 #include "log.h"
-#include "event.h"
+#include "frrevent.h"
 #include "zclient.h"
 #include "memory.h"
 #include "table.h"

lib/zlog.c

@@ -48,7 +48,7 @@
 #include "frrcu.h"
 #include "zlog.h"
 #include "libfrr_trace.h"
-#include "event.h"
+#include "frrevent.h"
 
 DEFINE_MTYPE_STATIC(LIB, LOG_MESSAGE,  "log message");
 DEFINE_MTYPE_STATIC(LIB, LOG_TLSBUF,   "log thread-local buffer");

lib/zlog_5424.c

@@ -26,7 +26,7 @@
 #include "frr_pthread.h"
 #include "command.h"
 #include "monotime.h"
-#include "event.h"
+#include "frrevent.h"
 
 #include "lib/version.h"
 #include "lib/lib_errors.h"

mgmtd/mgmt_be_adapter.c

@@ -7,7 +7,7 @@
  */
 
 #include <zebra.h>
-#include "event.h"
+#include "frrevent.h"
 #include "sockopt.h"
 #include "network.h"
 #include "libfrr.h"