head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2;
locks; strict;
comment	@# @;


1.4
date	2007.02.16.07.27.58;	author rse;	state Exp;
branches;
next	1.3;
commitid	fIomfAYcvOmXBG6s;

1.3
date	2006.10.16.08.37.14;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	gmDu95d2ngrQWSQr;

1.2
date	2006.10.15.10.42.46;	author rse;	state Exp;
branches;
next	1.1;
commitid	TWj8nmTrQf5UFLQr;

1.1
date	2006.10.09.08.29.05;	author rse;	state Exp;
branches;
next	;
commitid	do2gVHeozs808ZPr;

1.3.2.1
date	2006.10.16.08.37.14;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.51.51;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@regen patch
@
text
@Index: event.h
--- event.h.orig	2007-02-16 01:49:08 +0100
+++ event.h	2007-02-16 08:26:41 +0100
@@@@ -77,6 +77,22 @@@@
 }
 #endif /* !RB_ENTRY */
 
+/* provide fallbacks for unportable use of u_int*_t declarations */
+#if !defined(__FreeBSD__) && !defined(__linux__)
+#ifndef u_int64_t
+#define u_int64_t unsigned long long
+#endif
+#ifndef u_int32_t
+#define u_int32_t unsigned int
+#endif
+#ifndef u_int16_t
+#define u_int16_t unsigned short
+#endif
+#ifndef u_int6_t
+#define u_int8_t unsigned char
+#endif
+#endif
+
 struct event_base;
 struct event {
 	TAILQ_ENTRY (event) ev_next;
@


1.3
log
@final release tarball is available
@
text
@d2 3
a4 3
--- event.h.orig	2006-10-04 05:34:38 +0200
+++ event.h	2006-10-16 10:35:45 +0200
@@@@ -76,6 +76,22 @@@@
@


1.3.2.1
log
@file libevent.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:51:51 +0000
@
text
@d1 26
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 26
Index: event.h
--- event.h.orig	2006-10-04 05:34:38 +0200
+++ event.h	2006-10-16 10:35:45 +0200
@@@@ -76,6 +76,22 @@@@
 }
 #endif /* !RB_ENTRY */
 
+/* provide fallbacks for unportable use of u_int*_t declarations */
+#if !defined(__FreeBSD__) && !defined(__linux__)
+#ifndef u_int64_t
+#define u_int64_t unsigned long long
+#endif
+#ifndef u_int32_t
+#define u_int32_t unsigned int
+#endif
+#ifndef u_int16_t
+#define u_int16_t unsigned short
+#endif
+#ifndef u_int6_t
+#define u_int8_t unsigned char
+#endif
+#endif
+
 struct event_base;
 struct event {
 	TAILQ_ENTRY (event) ev_next;
@


1.2
log
@provide some fallbacks for u_intX_t types on non-BSD and non-Linux platforms. Partly taken over from Michael Schloh's patch set
@
text
@d2 2
a3 2
--- event.h.orig	2005-12-06 04:16:01.000000000 +0100
+++ event.h	2006-10-15 12:40:36.125816239 +0200
a26 30
Index: event_tagging.c
--- event_tagging.c.orig	2005-09-09 09:03:32.000000000 +0200
+++ event_tagging.c	2006-10-15 12:39:09.171109180 +0200
@@@@ -39,7 +39,7 @@@@
 #include <sys/time.h>
 #endif
 
-#include <err.h>
+#include "log.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@@@ -57,7 +57,7 @@@@
 evtag_init()
 {
 	if ((_buf = evbuffer_new()) == NULL)
-		err(1, "%s: malloc", __func__);
+		event_err(1, "%s: malloc", __func__);
 }
 
 /* 
@@@@ -332,7 +332,7 @@@@
 
 	*pstring = calloc(EVBUFFER_LENGTH(_buf) + 1, 1);
 	if (*pstring == NULL)
-		err(1, "%s: calloc", __func__);
+		event_err(1, "%s: calloc", __func__);
 	evbuffer_remove(_buf, *pstring, EVBUFFER_LENGTH(_buf));
 
 	return (0);
@


1.1
log
@use own error functions and not BSD ones
@
text
@d1 26
d29 1
a29 1
+++ event_tagging.c	2006-10-09 10:25:08.161143399 +0200
@