diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-07-15 01:21:40 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-07-15 01:21:40 +0000 |
| commit | 1f0275e3cc0bc5fbe11e3bffd54581aa05c9c764 (patch) | |
| tree | fac6166e65e5ecf207f69d77e00529a7337d91ac /scheduler/select.c | |
| parent | 4509bb49335b3edfdb1b03d83d6cd05890968b59 (diff) | |
| download | cups-1f0275e3cc0bc5fbe11e3bffd54581aa05c9c764.tar.gz | |
Merge changes from CUPS 1.4svn-r7715.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@859 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/select.c')
| -rw-r--r-- | scheduler/select.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scheduler/select.c b/scheduler/select.c index 6f6843685..20c9547fd 100644 --- a/scheduler/select.c +++ b/scheduler/select.c @@ -3,7 +3,7 @@ * * Select abstraction functions for the Common UNIX Printing System (CUPS). * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2008 by Apple Inc. * Copyright 2006-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -259,7 +259,9 @@ cupsdAddSelect(int fd, /* I - File descriptor */ void *data) /* I - Data to pass to callback */ { _cupsd_fd_t *fdptr; /* File descriptor record */ +#ifdef HAVE_EPOLL int added; /* 1 if added, 0 if modified */ +#endif /* HAVE_EPOLL */ /* @@ -296,10 +298,14 @@ cupsdAddSelect(int fd, /* I - File descriptor */ return (0); } +#ifdef HAVE_EPOLL added = 1; } else added = 0; +#else + } +#endif /* HAVE_EPOLL */ #ifdef HAVE_KQUEUE { |