Merge changes from CUPS 1.4svn-r8639.

[thirdparty/cups.git] / cups / sidechannel.c

diff --git a/cups/sidechannel.c b/cups/sidechannel.c
index 41db25e67de9b6698435d08b204ca2db3096cb15..0f51fd1bd24ee1efac096495224fb2c844a5f6b4 100644 (file)
--- a/cups/sidechannel.c
+++ b/cups/sidechannel.c
@@ -31,11 +31,15 @@
 #include "sidechannel.h"
 #include "string.h"
 #include "debug.h"
-#include <unistd.h>
+#ifdef WIN32
+#  include <io.h>
+#else
+#  include <unistd.h>
+#endif /* WIN32 */
 #include <errno.h>
 #ifdef __hpux
 #  include <sys/time.h>
-#else
+#elif !defined(WIN32)
 #  include <sys/select.h>
 #endif /* __hpux */
 #ifndef WIN32
@@ -266,7 +270,7 @@ cupsSideChannelRead(
  * support SNMP queries.  @code CUPS_SC_STATUS_NO_RESPONSE@ is returned when
  * the printer does not respond to the SNMP query.
  *
- * @since CUPS 1.4@ 
+ * @since CUPS 1.4/Mac OS X 10.6@ 
  */
 
 cups_sc_status_t                       /* O  - Query status */
@@ -358,7 +362,7 @@ cupsSideChannelSNMPGet(
  * support SNMP queries.  @code CUPS_SC_STATUS_NO_RESPONSE@ is returned when
  * the printer does not respond to the first SNMP query.
  *
- * @since CUPS 1.4@ 
+ * @since CUPS 1.4/Mac OS X 10.6@ 
  */
 
 cups_sc_status_t                       /* O - Status of first query of @code CUPS_SC_STATUS_OK@ on success */