From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 12 Jun 2013 13:00:54 +0000 (+0000)
Subject: ARM-based Linux doesn't allow pointer comparisons on va_list values; not sure
X-Git-Tag: release-1.7rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56cd8959f0908f7d22fe99ea582f4d537c21124a;p=thirdparty%2Fcups.git

ARM-based Linux doesn't allow pointer comparisons on va_list values; not sure
how you are supposed to validate input, but whatever...


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

diff --git a/CHANGES.txt b/CHANGES.txt
index de0c0bab6b..105e1a9f76 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,10 @@
-CHANGES.txt - 1.7rc1 - 2013-06-06
+CHANGES.txt - 1.7rc1 - 2013-06-12
 ---------------------------------
 
 CHANGES IN CUPS V1.7rc1
 
+	- Fixed a build issue on ARM-based Linux systems - unable to validate
+	  va_list arguments.
 	- Added a new ippfind tool for finding IPP printers and other Bonjour
 	  services (<rdar://problem/13876199>)
 	- Fixed some issues with conversion of PWG media size names to
diff --git a/cups/ipp.c b/cups/ipp.c
index 335020d3d6..2fa574115b 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1210,7 +1210,7 @@ ippAddStringfv(ipp_t      *ipp,		/* I - IPP message */
       group == IPP_TAG_END || group >= IPP_TAG_UNSUPPORTED_VALUE ||
       (value_tag < IPP_TAG_TEXT && value_tag != IPP_TAG_TEXTLANG &&
        value_tag != IPP_TAG_NAMELANG) || value_tag > IPP_TAG_MIMETYPE ||
-      !format || !ap)
+      !format)
     return (NULL);
 
   if ((value_tag == IPP_TAG_TEXTLANG || value_tag == IPP_TAG_NAMELANG)
@@ -4449,7 +4449,7 @@ ippSetStringfv(ipp_t           *ipp,	/* I  - IPP message */
   if (!ipp || !attr || !*attr ||
       (value_tag < IPP_TAG_TEXT && value_tag != IPP_TAG_TEXTLANG &&
        value_tag != IPP_TAG_NAMELANG) || value_tag > IPP_TAG_MIMETYPE ||
-      !format || !ap)
+      !format)
     return (0);
 
  /*
diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
index 18990f2bef..b16aca1162 100644
--- a/xcode/CUPS.xcodeproj/project.pbxproj
+++ b/xcode/CUPS.xcodeproj/project.pbxproj
@@ -2653,7 +2653,7 @@
 		72BF96371333042100B1EAD7 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0450;
+				LastUpgradeCheck = 0500;
 				ORGANIZATIONNAME = "Apple Inc.";
 			};
 			buildConfigurationList = 72BF963A1333042100B1EAD7 /* Build configuration list for PBXProject "CUPS" */;
@@ -3968,7 +3968,6 @@
 		72BF963C1333042100B1EAD7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -3984,6 +3983,7 @@
 					.,
 					..,
 				);
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-D_CUPS_SOURCE",
 					"-Wno-shorten-64-to-32",
@@ -3994,7 +3994,6 @@
 		72BF963D1333042100B1EAD7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;