Fix some compilation fixes (STR #3771)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9477 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt
index 375b2b8d5edad36b37b6dd667ef7795f27c3751f..43e1a3565de9002467a96f6f44b54a1632cbc16d 100644 (file)
--- a/CHANGES-1.4.txt
+++ b/CHANGES-1.4.txt
@@ -8,10 +8,10 @@ CHANGES IN CUPS V1.4.7
        - Web interface fixes (STR #3412, STR #3345, STR #3455, STR #3707,
          STR #3755, STR #3769)
        - Configure script fixes (STR #3659, STR #3691)
+       - Compilation fixes (STR #3718, STR #3771)
        - Fixed a crash bug in the scheduler when the application/octet-stream
          MIME type was not defined (STR #3690)
        - Polled printers were advertised more slowly than necessary (STR #3574)
-       - Fixed a compile problem on Solaris (STR #3718)
        - cupsResolveConflicts() did not handle resolving multiple UIConstraints
          issues (STR #3705)
        - The SetEnv and PassEnv directives had no effect (STR #3664)

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 7b5a29f1c71dc3588b263dc72cea14c68145e4ef..1eb1cc6ba84b3381626c749ee0b3a175170c9244 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -219,7 +219,7 @@ else
 fi
 
 if test $check_libusb = yes; then
-       AC_CHECK_LIB(usb, usb_init,[
+       AC_CHECK_LIB(usb, usb_get_string_simple,[
                AC_CHECK_HEADER(usb.h,
                        AC_DEFINE(HAVE_USB_H)
                        LIBUSB="-lusb")])

diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 0f7226952ca1938d7d5ef4757a2564c0810079ac..eed7979fbbcef630beb5bf64a8cce6f67877f439 100644 (file)
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -3,7 +3,7 @@
  *
  *   IPP routines for the CUPS scheduler.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   This file contains Kerberos support code, copyright 2006 by
@@ -5495,7 +5495,11 @@ copy_banner(cupsd_client_t *con, /* I - Client connection */
          case IPP_TAG_ENUM :
              if (!strncmp(s, "time-at-", 8))
              {
-               struct timeval tv = { attr->values[i].integer, 0 };
+               struct timeval tv;      /* Time value */
+
+               tv.tv_sec  = attr->values[i].integer;
+               tv.tv_usec = 0;
+
                cupsFilePuts(out, cupsdGetDateTime(&tv, CUPSD_TIME_STANDARD));
              }
              else

diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index a1a02dd5bfea4eb5773b0bc4a26e93f446f732d7..aa1dba8e80e69d5d4a50794312aa2cdad410baf2 100644 (file)
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -3,7 +3,7 @@
  *
  *   "lpadmin" command for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -1230,7 +1230,7 @@ set_printer_options(
     ppdMarkDefaults(ppd);
     cupsMarkOptions(ppd, num_options, options);
 
-    if ((out = cupsTempFile2(tempfile, sizeof(tempfile))) < 0)
+    if ((out = cupsTempFile2(tempfile, sizeof(tempfile))) == NULL)
     {
       _cupsLangPrintError(NULL, _("lpadmin: Unable to create temporary file"));
       ippDelete(request);