git: 64c01719e476 - main - libevent1: fix layout of duplicated RB_ENTRY() definition

[Kyle Evans]

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=64c01719e476923fe1b24e5a6c6012a677cd017f

commit 64c01719e476923fe1b24e5a6c6012a677cd017f
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-03-24 04:31:02 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-03-24 04:39:43 +0000

    libevent1: fix layout of duplicated RB_ENTRY() definition
    
    3a509754ded1 removed the color field from our definition, but libevent1
    has a copy of it off to the side to prevent event.h consumers from
    *needing* to pull in sys/queue.h and sys/tree.h.
    
    Update the event.h definition so that we don't accidentally end up with
    two different views of struct event.
    
    This appears to have no functional effect on anything in tree, but this
    came up in a local patch to port if_switch(4) and related components
    from OpenBSD.
    
    MFC after:      1 week
---
 contrib/pf/libevent/event.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/pf/libevent/event.h b/contrib/pf/libevent/event.h
index 3f2032dd068e..0c19201611b5 100644
--- a/contrib/pf/libevent/event.h
+++ b/contrib/pf/libevent/event.h
@@ -73,7 +73,6 @@ struct {								\
 	struct type *rbe_left;		/* left element */		\
 	struct type *rbe_right;		/* right element */		\
 	struct type *rbe_parent;	/* parent element */		\
-	int rbe_color;			/* node color */		\
 }
 #endif /* !RB_ENTRY */