Commits

Jeff Laing  committed 399228e

Xcode 4.5 was causing me grief with #pragma once so use the traditional #if !defined() instead.
Fix a couple of ambiguous 'int vs long' conversions in stringWithFormat:

  • Participants
  • Parent commits 63b3cf3

Comments (0)

Files changed (3)

File MobileDeviceAccess.h

  */
 #pragma once
 
+// sometimes pragma once seems to get confused so lets go belt and braces
+#if !defined(_MobileDeviceAccess_h_)
+#define _MobileDeviceAccess_h_
+
 #import <Foundation/Foundation.h>
 //#import <CoreGraphics/CoreGraphics.h>
 
 #ifdef __cplusplus
 }
 #endif
+
+#endif // _MobileDeviceAccess.h

File MobileDeviceAccess.m

 				if (msg) {
 					[self setLastError:msg];
 				} else {
-					[self setLastError:[NSString stringWithFormat:@"Error %ld occurred, no message",e]];
+					[self setLastError:[NSString stringWithFormat:@"Error %ld occurred, no message",(long)e]];
 				}
 				CFRelease(err);
 			} else {
-				[self setLastError:[NSString stringWithFormat:@"Error %ld occurred, no error info",e]];
+				[self setLastError:[NSString stringWithFormat:@"Error %ld occurred, no error info",(long)e]];
 			}
 		}
 	}
 		if (nr > 0) {
 			NSInteger nw = [writestream write:buf maxLength:nr];
 			if (nw != nr) {
-				[self setLastError:[NSString stringWithFormat:@"File truncated on write, nr=%d nw=%d",nr,nw]];
+				[self setLastError:[NSString stringWithFormat:@"File truncated on write, nr=%ld nw=%ld",(long)nr,(long)nw]];
 				break;
 			}
 		} else if (nr < 0) {

File MobileDeviceAccess.xcodeproj/project.pbxproj

 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "MobileDeviceAccess" */;
 			compatibilityVersion = "Xcode 3.2";
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 1;