Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / backend / socket.c

diff --git a/backend/socket.c b/backend/socket.c
index 46d7f5edad389390fb6a982bf67f1f40b86f69c2..53f8dc0b57bd219cdeb97f3f25db43e4afc94c8f 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -3,7 +3,7 @@
  *
  *   AppSocket backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -72,9 +72,11 @@ main(int  argc,                              /* I - Number of command-line arguments (6 or 7) */
                sep;                    /* Option separator */
   int          print_fd;               /* Print file */
   int          copies;                 /* Number of copies to print */
-  time_t       start_time,             /* Time of first connect */
-               current_time,           /* Current time */
+  time_t       start_time;             /* Time of first connect */
+#ifdef __APPLE__
+  time_t       current_time,           /* Current time */
                wait_time;              /* Time to wait before shutting down socket */
+#endif /* __APPLE__ */
   int          contimeout;             /* Connection timeout */
   int          waiteof;                /* Wait for end-of-file? */
   int          port;                   /* Port number */
@@ -388,6 +390,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
                      CUPS_LLCAST tbytes);
   }
 
+#ifdef __APPLE__
  /*
   * Wait up to 5 seconds to get any pending back-channel data...
   */
@@ -396,6 +399,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
   while (wait_time >= time(&current_time))
     if (wait_bc(device_fd, wait_time - current_time) <= 0)
       break;
+#endif /* __APPLE__ */
 
   if (waiteof)
   {