kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix kqueue support for -current

Browse source 
PR:		30009
Submitted by:	maintainer
Reviewed by:	ade
This commit is contained in:
Pete Fritchman 2001-08-24 00:19:33 +00:00
parent e6e8cc0c83
commit c24eedb261
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=46757
2 changed files with 12 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
www/thttpd/Makefile
View file

@ -19,13 +19,6 @@ IGNOREFILES= notes.html
GNU_CONFIGURE= yes
.include <bsd.port.pre.mk>
# Kqueue doesn't work in -current with thttpd.
.if ${OSVERSION} >= 500000
CFLAGS+= -DHAVE_FREEBSD_CURRENT
.endif
MAN1= makeweb.1 htpasswd.1
MAN8= thttpd.8 redirect.8 ssi.8 syslogtocern.8
@ -87,4 +80,4 @@ config-message:
@${ECHO} ""
@${ECHO} "====================================================================="
.include <bsd.port.post.mk>
.include <bsd.port.mk>

31
www/thttpd/files/patch-fdwatch.c
View file

@ -1,21 +1,12 @@
--- fdwatch.c.orig Tue Apr 24 18:40:22 2001
+++ fdwatch.c Tue Apr 24 19:00:57 2001
@@ -32,6 +32,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <syslog.h>
+#include <sys/param.h>
--- fdwatch.c.orig Fri Aug 24 00:19:39 2001
+++ fdwatch.c Fri Aug 24 00:20:30 2001
@@ -311,6 +311,9 @@
if ( kqchanges == (struct kevent*) 0 || kqevents == (struct kevent*) 0 ||
kqrfdidx == (int*) 0 )
return -1;
+ memset(kqchanges, '\0', sizeof(struct kevent) * 2 * nfiles);
+ memset(kqevents, '\0', sizeof(struct kevent) * nfiles);
+ memset(kqrfdidx, '\0', sizeof(int) * nfiles);
return 0;
}
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -44,6 +45,10 @@
#include <sys/poll.h>
#endif /* HAVE_SYS_POLL_H */
#endif /* HAVE_POLL_H */
+
+#ifdef HAVE_FREEBSD_CURRENT
+#undef HAVE_KQUEUE
+#endif
#ifdef HAVE_SYS_EVENT_H
#include <sys/event.h>