===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/server-job.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/tmux/Attic/server-job.c	2009/11/01 23:20:37	1.3
--- src/usr.bin/tmux/Attic/server-job.c	2009/11/04 20:50:11	1.4
***************
*** 1,4 ****
! /* $OpenBSD: server-job.c,v 1.3 2009/11/01 23:20:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-job.c,v 1.4 2009/11/04 20:50:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 18,23 ****
--- 18,24 ----
  
  #include <sys/types.h>
  
+ #include <event.h>
  #include <unistd.h>
  
  #include "tmux.h"
***************
*** 31,43 ****
  	SLIST_FOREACH(job, &all_jobs, lentry) {
  		if (job->fd == -1)
  			continue;
! 		server_poll_add(job->fd, POLLIN, server_job_callback, job);
  	}
  }
  
  /* Process a single job event. */
  void
! server_job_callback(int fd, int events, void *data)
  {
  	struct job	*job = data;
  
--- 32,47 ----
  	SLIST_FOREACH(job, &all_jobs, lentry) {
  		if (job->fd == -1)
  			continue;
! 		event_del(&job->event);
! 		event_set(
! 		    &job->event, job->fd, EV_READ, server_job_callback, job);
! 		event_add(&job->event, NULL);
  	}
  }
  
  /* Process a single job event. */
  void
! server_job_callback(int fd, short events, void *data)
  {
  	struct job	*job = data;
  
***************
*** 55,61 ****
  server_job_loop(void)
  {
  	struct job	*job;
! 	
  restart:
  	SLIST_FOREACH(job, &all_jobs, lentry) {
  		if (job->flags & JOB_DONE || job->fd != -1 || job->pid != -1)
--- 59,65 ----
  server_job_loop(void)
  {
  	struct job	*job;
! 
  restart:
  	SLIST_FOREACH(job, &all_jobs, lentry) {
  		if (job->flags & JOB_DONE || job->fd != -1 || job->pid != -1)