head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.34
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.32
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.30
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.28
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.26
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.24
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.22
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.20
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.18
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.16
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.14
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.12
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.10
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.8
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.6
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.4
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.2
	pkgsrc-2006Q2-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2006.05.11.02.36.15;	author jwise;	state dead;
branches;
next	1.1;

1.1
date	2006.05.10.20.31.50;	author christos;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to i2cbd-2.0_BETA4.

This release folds in pkgsrc patches patch-ad through patch-ai.

For the moment, remove patch-aj as well, since it doesn't apply (file paths
are wrong).  I'll try to fold this into the next beta, however.
@
text
@$NetBSD: patch-ai,v 1.1 2006/05/10 20:31:50 christos Exp $

--- src/serverserve.c.orig	2001-10-26 19:07:19.000000000 -0400
+++ src/serverserve.c	2006-05-10 16:28:22.000000000 -0400
@@@@ -19,7 +19,9 @@@@
 fd_set held_fdset;
 
 void	serverserve (void);
+#ifdef USE_ALARM
 static void	gotalarm (int);
+#endif
 static void	sdoinput (void);
 
 void
@@@@ -35,10 +37,13 @@@@
 		for (i = 0; i < MAX_USERS+1; i++)
 			cbufs[i].new = 1;
 
+#ifdef USE_ALARM
 	signal(SIGALRM, gotalarm);
+#endif
 	timeisup = 0;
 
 	for (;;) {
+#ifdef USE_ALARM
 		if (polldelay) {
 			if (setitimer(ITIMER_REAL, polldelay, 0) < 0) {
 				perror("server: setitimer failed");
@@@@ -46,6 +51,7 @@@@
 			}
 			timeisup = 0;
 		}
+#endif
 
 		memmove(&fdr, &fdset, sizeof(fdset));
 		memmove(&efdr, &fdset, sizeof(fdset));
@@@@ -85,12 +91,14 @@@@
 	}
 }
 
+#ifdef USE_ALARM
 static void
 gotalarm(int n)
 {
 	timeisup++;
 	signal(n, gotalarm);
 }
+#endif
 
 static void
 sdoinput(void)
@


1.1
log
@setting a 1 second alarm and a 10 second select timeout is silly. #ifdef
out the alarm code, and just deal with select.
@
text
@d1 1
a1 1
$NetBSD$
@