No I think we are keeping the evutil.h file for now, the idea is just to
stop event.h including it.
On Thu, Oct 30, 2014 at 09:20:49AM +0100, Landry Breuil wrote:
> On Thu, Oct 30, 2014 at 08:14:35AM +0000, Nicholas Marriott wrote:
> > I'd like to see evutil.h go so I'm happy with this idea but yes you will
> > need to make sure it doesn't break ports, there are still quite a few
> > ports that depend on the base libevent.
>
> I'll run a bulk build with that. Apply diff to event.h, remove
> /usr/include/evutil.h, and that's enough, right ?
>
> Landry
>
> > On Thu, Oct 30, 2014 at 02:43:32AM +0100, Alexander Bluhm wrote:
> > > Hi,
> > >
> > > libevent has compatibilty wrappers in evutil. Our tree does not
> > > use them anymore, but they are still part of libevent's interface.
> > >
> > > I don't want to include them automatically, so I suggest to remove
> > > evutil.h from event.h. A version bump should not be necessary as
> > > the library itself does not change.
> > >
> > > Does my idea make sense?
> > > Is a full ports build needed with this diff?
> > >
> > > bluhm
> > >
> > > Index: lib/libevent/event.h
> > > ===================================================================
> > > RCS file: /data/mirror/openbsd/cvs/src/lib/libevent/event.h,v
> > > retrieving revision 1.27
> > > diff -u -p -r1.27 event.h
> > > --- lib/libevent/event.h 8 Oct 2014 20:14:19 -0000 1.27
> > > +++ lib/libevent/event.h 29 Oct 2014 23:42:45 -0000
> > > @@ -168,8 +168,11 @@ extern "C" {
> > > #include <stdarg.h>
> > > #include <stdint.h>
> > >
> > > -/* For int types. */
> > > -#include <evutil.h>
> > > +#define ev_uint64_t uint64_t
> > > +#define ev_int64_t int64_t
> > > +#define ev_uint32_t uint32_t
> > > +#define ev_uint16_t uint16_t
> > > +#define ev_uint8_t uint8_t
> > >
> > > #define EVLIST_TIMEOUT 0x01
> > > #define EVLIST_INSERTED 0x02
> > >
> >
>
