From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 19 Jan 2015 15:17:18 +0000 (+0000)
Subject: Fix compiler warnings.
X-Git-Tag: v2.2b1~384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6884f8da9655323f0fb3f22e8058ea5d723f74a0;p=thirdparty%2Fcups.git

Fix compiler warnings.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12411 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/cups/http-private.h b/cups/http-private.h
index 46e093c347..767f3cbdfb 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -3,7 +3,7 @@
  *
  * Private HTTP definitions for CUPS.
  *
- * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2007-2015 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  * These coded instructions, statements, and computer programs are the
@@ -188,8 +188,8 @@ typedef gnutls_certificate_credentials_t *http_tls_credentials_t;
 extern const char *cssmErrorString(int error);
 #    endif /* !HAVE_SECBASEPRIV_H && HAVE_CSSMERRORSTRING */
 #    ifndef HAVE_SECITEMPRIV_H /* Declare constants from that header... */
-extern const CFTypeRef kSecClassCertificate;
-extern const CFTypeRef kSecClassIdentity;
+extern const CFStringRef kSecClassCertificate;
+extern const CFStringRef kSecClassIdentity;
 #    endif /* !HAVE_SECITEMPRIV_H */
 #    if !defined(HAVE_SECIDENTITYSEARCHPRIV_H) && defined(HAVE_SECIDENTITYSEARCHCREATEWITHPOLICY) /* Declare prototype for function in that header... */
 extern OSStatus SecIdentitySearchCreateWithPolicy(SecPolicyRef policy,
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index 30d92b47de..7b4655eed6 100644
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -3,7 +3,7 @@
  *
  *   PPD test program for CUPS.
  *
- *   Copyright 2007-2013 by Apple Inc.
+ *   Copyright 2007-2015 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -15,26 +15,6 @@
  *   PostScript is a trademark of Adobe Systems, Inc.
  *
  *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main()               - Main entry for test program.
- *   check_basics()       - Check for CR LF, mixed line endings, and blank
- *                          lines.
- *   check_constraints()  - Check UIConstraints in the PPD file.
- *   check_case()         - Check that there are no duplicate groups, options,
- *                          or choices that differ only by case.
- *   check_defaults()     - Check default option keywords in the PPD file.
- *   check_duplex()       - Check duplex keywords in the PPD file.
- *   check_filters()      - Check filters in the PPD file.
- *   check_profiles()     - Check ICC color profiles in the PPD file.
- *   check_sizes()        - Check media sizes in the PPD file.
- *   check_translations() - Check translations in the PPD file.
- *   show_conflicts()     - Show option conflicts in a PPD file.
- *   test_raster()        - Test PostScript commands for raster printers.
- *   usage()              - Show program usage.
- *   valid_path()         - Check whether a path has the correct capitalization.
- *   valid_utf8()         - Check whether a string contains valid UTF-8 text.
  */
 
 /*
@@ -3218,8 +3198,8 @@ check_sizes(ppd_file_t *ppd,		/* I - PPD file */
       pwg_media      = pwgMediaForSize(width_2540ths, length_2540ths);
 
       if (pwg_media &&
-          (fabs(pwg_media->width - width_2540ths) > 34 ||
-           fabs(pwg_media->length - length_2540ths) > 34))
+          (abs(pwg_media->width - width_2540ths) > 34 ||
+           abs(pwg_media->length - length_2540ths) > 34))
         pwg_media = NULL;		/* Only flag matches within a point */
 
       if (pwg_media && pwg_media->ppd &&