[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r7093 - trunk/scheduler
From:       cups-dev () easysw ! com
Date:       2007-11-30 19:09:36
Message-ID: 7197-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2007-11-30 11:09:36 -0800 (Fri, 30 Nov 2007)
New Revision: 7093
Log:
Fix compile problem on Mac OS X.


Modified:
   trunk/scheduler/select.c

Modified: trunk/scheduler/select.c
===================================================================
--- trunk/scheduler/select.c	2007-11-30 07:00:59 UTC (rev 7092)
+++ trunk/scheduler/select.c	2007-11-30 19:09:36 UTC (rev 7093)
@@ -215,7 +215,11 @@
 static int		cupsd_in_select = 0;
 #endif /* HAVE_EPOLL || HAVE_KQUEUE */
 
-#ifdef HAVE_POLL
+#ifdef HAVE_KQUEUE
+static int		cupsd_kqueue_fd = -1,
+			cupsd_kqueue_changes = 0;
+static struct kevent	*cupsd_kqueue_events = NULL;
+#elif defined(HAVE_POLL)
 static int		cupsd_alloc_pollfds = 0,
 			cupsd_update_pollfds = 0;
 static struct pollfd	*cupsd_pollfds = NULL;
@@ -223,16 +227,12 @@
 static int		cupsd_epoll_fd = -1;
 static struct epoll_event *cupsd_epoll_events = NULL;
 #  endif /* HAVE_EPOLL */
-#elif defined(HAVE_KQUEUE)
-static int		cupsd_kqueue_fd = -1,
-			cupsd_kqueue_changes = 0;
-static struct kevent	*cupsd_kqueue_events = NULL;
 #else /* select() */
 static fd_set		cupsd_global_input,
 			cupsd_global_output,
 			cupsd_current_input,
 			cupsd_current_output;
-#endif /* HAVE_EPOLL */
+#endif /* HAVE_KQUEUE */
 
 
 /*
@@ -737,7 +737,9 @@
   * Release all inactive file descriptors...
   */
 
+#  ifndef HAVE_KQUEUE
   release_inactive:
+#  endif /* !HAVE_KQUEUE */
 
   cupsd_in_select = 0;
 

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]