ccollect:0.6.2->0.7.0
[nslu2-linux/optware.git] / sources / cups / uclibc-backend-lpd.c.patch
blob6c4033327961e2b390a773c7339d0855083fdeee
1 --- cups-1.2.2/backend/lpd.c 2006-05-05 19:58:07.000000000 +0200
2 +++ cups/backend/lpd.c 2006-07-24 11:42:02.000000000 +0200
3 @@ -102,9 +102,15 @@
4 int manual_copies, int timeout, int contimeout);
5 static void lpd_timeout(int sig);
6 static int lpd_write(int lpd_fd, char *buffer, int length);
8 #ifndef HAVE_RRESVPORT_AF
9 +# if defined (__UCLIBC__) && __UCLIBC_SUBLEVEL__ < 28
10 +# warning rresvport_af not defined in old UCLIBC
11 +# else
12 static int rresvport_af(int *port, int family);
13 +# endif
14 #endif /* !HAVE_RRESVPORT_AF */
16 static void sigterm_handler(int sig);
19 @@ -1134,7 +1140,12 @@
21 static int /* O - Socket or -1 on error */
22 rresvport_af(int *port, /* IO - Port number to bind to */
23 +#if defined(__UCLIBC__) && __UCLIBC_SUBLEVEL__ < 28
24 + sa_family_t family) /* I - Address family */
25 +#else
26 int family) /* I - Address family */
27 +#endif
30 http_addr_t addr; /* Socket address */
31 int fd; /* Socket file descriptor */