Fix CUPS 1.2 compiles...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3896 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/backend/usb.c b/backend/usb.c
index a231a4fa094b514b471147c54298e5cdcafbb7ed..81f95eeef1c499f45e1817e9f40984e3b740ccbf 100644 (file)
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb.c,v 1.18.2.27 2003/08/30 23:13:00 mike Exp $"
+ * "$Id: usb.c,v 1.18.2.28 2003/08/31 11:25:33 mike Exp $"
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
@@ -244,7 +244,7 @@ main(int  argc,             /* I - Number of command-line arguments (6 or 7) */
 
     if (!(status & LP_POUTPA))
       fputs("WARNING: Media tray empty!\n", stderr);
-    else if (!(status & LP_PERRORP)
+    else if (!(status & LP_PERRORP))
       fputs("WARNING: Printer fault!\n", stderr);
     else if (!(status & LP_PSELECD))
       fputs("WARNING: Printer off-line.\n", stderr);
@@ -798,5 +798,5 @@ open_device(const char *uri)                /* I - Device URI */
 
 
 /*
- * End of "$Id: usb.c,v 1.18.2.27 2003/08/30 23:13:00 mike Exp $".
+ * End of "$Id: usb.c,v 1.18.2.28 2003/08/31 11:25:33 mike Exp $".
  */

diff --git a/cups/Makefile b/cups/Makefile
index 041b456cecf8c9da0d2f9efef0b48e560072c530..9a857243080cb05a8da2a065b9d0d7a571bd3b29 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.53.2.24 2003/04/01 15:22:29 swdev Exp $"
+# "$Id: Makefile,v 1.53.2.25 2003/08/31 11:25:34 mike Exp $"
 #
 #   API library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -30,10 +30,11 @@ include ../Makedefs
 # Object files...
 #
 
-LIBOBJS        =       attr.o dest.o emit.o encode.o extended.o http.o http-addr.o \
-               http-support.o ipp.o ipp-support.o langprintf.o language.o \
-               mark.o md5.o md5passwd.o normalize.o options.o page.o ppd.o \
-               snprintf.o string.o tempfile.o transcode.o usersys.o util.o
+LIBOBJS        =       attr.o auth.o dest.o emit.o encode.o extended.o getputfile.o \
+               http.o http-addr.o http-support.o ipp.o ipp-support.o \
+               langprintf.o language.o mark.o md5.o md5passwd.o normalize.o \
+               options.o page.o ppd.o snprintf.o string.o tempfile.o \
+               transcode.o usersys.o util.o
 OBJS   =       $(LIBOBJS) testhttp.o testi18n.o testipp.o testlang.o
 
 
@@ -218,5 +219,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.53.2.24 2003/04/01 15:22:29 swdev Exp $".
+# End of "$Id: Makefile,v 1.53.2.25 2003/08/31 11:25:34 mike Exp $".
 #

diff --git a/cups/auth.c b/cups/auth.c
index e41ba945f943029bf60d7b70dba7c03cd52f2b6f..7a7264f54b7061ed49b86c081c491abf7f2c0e3d 100644 (file)
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c,v 1.1 2003/08/29 21:26:40 mike Exp $"
+ * "$Id: auth.c,v 1.1.2.1 2003/08/31 11:25:35 mike Exp $"
  *
  *   Authentication functions for the Common UNIX Printing System (CUPS).
  *
@@ -179,7 +179,7 @@ cups_local_auth(http_t *http)               /* I - HTTP connection to server */
   * See if we are accessing localhost...
   */
 
-  if (ntohl(http->hostaddr.sin_addr.s_addr) != 0x7f000001 &&
+  if (!httpAddrLocalhost(&http->hostaddr) &&
       strcasecmp(http->hostname, "localhost") != 0)
   {
     DEBUG_puts("cups_local_auth: Not a local connection!");
@@ -234,5 +234,5 @@ cups_local_auth(http_t *http)               /* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: auth.c,v 1.1 2003/08/29 21:26:40 mike Exp $".
+ * End of "$Id: auth.c,v 1.1.2.1 2003/08/31 11:25:35 mike Exp $".
  */

diff --git a/cups/getputfile.c b/cups/getputfile.c
index bb38244cb21aa1b51839c4fc26b4ef186df3fa04..d6b8ef9bff4ad8416a92d5116b40389640f963b9 100644 (file)
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: getputfile.c,v 1.1 2003/08/29 21:26:41 mike Exp $"
+ * "$Id: getputfile.c,v 1.1.2.1 2003/08/31 11:25:35 mike Exp $"
  *
  *   Get/put file functions for the Common UNIX Printing System (CUPS).
  *
@@ -431,5 +431,5 @@ cupsPutFile(http_t     *http,               /* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: getputfile.c,v 1.1 2003/08/29 21:26:41 mike Exp $".
+ * End of "$Id: getputfile.c,v 1.1.2.1 2003/08/31 11:25:35 mike Exp $".
  */