Further fixes for compilability.

PhotoLibrary/CLLocationManagerDelegate.h

@@ -7,12 +7,4 @@
 
 #import "NSObject.h"
 
-
-@protocol CLLocationManagerDelegate <NSObject>
-@optional
--(void)locationManager:(id)manager didUpdateToLocation:(id)location fromLocation:(id)location3;
--(void)locationManager:(id)manager didUpdateHeading:(id)heading;
--(BOOL)locationManagerShouldDisplayHeadingCalibration:(id)locationManager;
--(void)locationManager:(id)manager didFailWithError:(id)error;
-@end
-
+#import <CoreLocation/CLLocationManagerDelegate.h>

PhotoLibrary/MLPhotoBakedThumbnailsDelegate.h

@@ -5,10 +5,4 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
-#import "PhotoLibrary-Structs.h"
-
-
-@protocol MLPhotoBakedThumbnailsDelegate
--(void)decorateThumbnail:(id)thumbnail inContext:(CGContextRef)context;
-@end
-
+#import <MusicLibrary/MLPhotoBakedThumbnailsDelegate.h>

PhotoLibrary/PLDataArrayInputStream.h

@@ -6,7 +6,7 @@
  */
 
 #import "PhotoLibrary-Structs.h"
-#import <Foundation/NSInputStream.h>
+#import <Foundation/NSStream.h>
 
 @class NSArray, NSMutableData;
 @protocol PLDataArrayInputStreamProgressDelegate;

PhotoLibrary/PLImageView.h

@@ -5,6 +5,57 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
+#import <Availability2.h>
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_3_2
+
+// me being lazy here. no diff.
+
+#import <UIKit/UIImageView.h>
+@class PLVideoView, UILabel, NSString;
+
+@interface PLImageView : UIImageView {
+	NSString* _name;
+	UIView* _borderView;
+	PLVideoView* _videoView;
+	UILabel* _textBadge;
+	unsigned _shadowEnabled : 1;
+	unsigned _suppressShadowDrawing : 1;
+	unsigned _borderIsVisible : 1;
+	float _aspectRatio;
+	double _lastBorderAlphaTime;
+	double _lastShadowAlphaTime;
+	float _transitionProgress;
+	BOOL _edgeAntialiasingEnabled;
+}
+@property(copy, nonatomic) NSString* name;
+@property(assign, nonatomic) float transitionProgress;
+@property(retain, nonatomic) PLVideoView* videoView;
+@property(assign, nonatomic) float borderAlpha;
+@property(assign, nonatomic, getter=isBorderVisible) BOOL borderVisible;
+@property(assign, nonatomic, getter=isDimmed) BOOL dimmed;
+@property(assign, nonatomic, getter=isShadowEnabled) BOOL shadowEnabled;
++(void)initialize;
++(BOOL)shouldDrawShadows;
++(id)textBadgeForString:(id)string photoSize:(CGSize)size;
+-(id)textBadgeString;
+-(void)setTextBadgeString:(id)string;
+-(id)initWithFrame:(CGRect)frame;
+-(void)dealloc;
+-(CGSize)sizeThatFits:(CGSize)fits allowRounding:(BOOL)rounding;
+-(CGSize)sizeThatFits:(CGSize)fits;
+-(void)renderSnapshotInContext:(CGContextRef)context;
+-(void)layoutSubviews;
+-(void)_updateShadowPath;
+-(void)setImage:(id)image;
+-(void)parentDidLayout;
+-(void)setBorderAlpha:(float)alpha forced:(BOOL)forced;
+-(void)setBorderWidthScale:(float)scale heightScale:(float)scale2;
+-(void)setEdgeAntialiasingEnabled:(BOOL)enabled;
+@end
+
+#else
+
 #import "PhotoLibrary-Structs.h"
 #import <UIKit/UITiledView.h>
 #import "PLItemView.h"
@@ -92,3 +143,4 @@
 -(void)zoomToWindowPoint:(CGPoint)windowPoint scale:(float)scale duration:(float)duration constrainScrollPoint:(BOOL)point event:(GSEventRef)event;
 @end
 
+#endif

PhotoLibrary/PLImageViewTile.h

@@ -5,6 +5,10 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
+#import <Availability2.h>
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_3_2
+
 #import "PhotoLibrary-Structs.h"
 #import <UIKit/UITile.h>
 
@@ -17,3 +21,5 @@
 -(void)setFrame:(CGRect)frame;
 @end
 
+#endif
+

PhotoLibrary/PLTVOutImageTileView.h

@@ -5,6 +5,10 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
+#import <Availability2.h>
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_3_2
+
 #import "PhotoLibrary-Structs.h"
 #import "PLImageTileView.h"
 
@@ -17,3 +21,4 @@
 // inherited: -(CGSize)imageSize;
 @end
 
+#endif

PhotoLibrary/UIImagePickerControllerDelegate.h

@@ -5,13 +5,4 @@
  * Source: /System/Library/PrivateFrameworks/PhotoLibrary.framework/PhotoLibrary
  */
 
-#import "NSObject.h"
-
-
-@protocol UIImagePickerControllerDelegate <NSObject>
-@optional
--(void)imagePickerController:(id)controller didFinishPickingImage:(id)image editingInfo:(id)info;
--(void)imagePickerController:(id)controller didFinishPickingMediaWithInfo:(id)info;
--(void)imagePickerControllerDidCancel:(id)imagePickerController;
-@end
-
+#import <UIKit/UIImagePickerController.h>

Preferences/PSTableCell.h

@@ -6,7 +6,7 @@
  */
 
 #import "Preferences-Structs.h"
-#import "PSTableCell.h"
+#import "PSSpecifier.h"
 #import <UIKit/UIPreferencesTableCell.h>
 
 

SpringBoard/APSConnectionDelegate.h

@@ -5,11 +5,5 @@
  * Source: (null)
  */
 
-#import "NSObject.h"
-
-
-@protocol APSConnectionDelegate <NSObject>
--(void)connection:(id)connection didReceivePublicToken:(id)token;
--(void)connection:(id)connection didReceiveMessageForTopic:(id)topic userInfo:(id)info;
-@end
+#import <Message/APSConnectionDelegate.h>
 

SpringBoard/SpringBoard-Structs.h

@@ -12,6 +12,7 @@
 #import <AppSupport/AppSupport.h>
 #import <ChatKit/ChatKit.h>
 #import <QuartzCore/QuartzCore2.h>
+#import <DataAccess/DataAccess.h>
 
 typedef struct __CTCall* CTCallRef;
 
@@ -41,21 +42,10 @@ typedef struct {
 	long long voicemailID;
 } XXStruct_EX3dgA;
 
-typedef struct {
-	int _field1;
-	BOOL _field2;
-	BOOL _field3;
-	BOOL _field4;
-	BOOL _field5;
-	double _field6;
-} XXStruct_fhKmAA;
-
 typedef struct CalEventExpirationMonitor CalEventExpirationMonitor;
 
 typedef struct CalAlarmEngine CalAlarmEngine;
 
-typedef struct CalDatabase CalDatabase;
-
 typedef struct {
 	double _field1;
 	double _field2;

SpringBoardServices/SpringBoardServices.h

@@ -73,9 +73,7 @@ extern "C" {
 	void SBReloadApplication(mach_port_t port) __OSX_AVAILABLE_STARTING(__MAC_NA, __IPHONE_3_0);
 	 */
 
-
-#endif
-
+
 #if __cplusplus
 }
 #endif

TelephonyUI/TelephonyUI-Structs.h

@@ -6,11 +6,6 @@
  */
 
 #import <GraphicsServices/GraphicsServices.h>
-
-typedef struct {
-	CGRect _field1;
-	CGRect _field2;
-	CGRect _field3;
-} XXStruct_SIyEID;
+#import <PhotoLibrary/PhotoLibrary.h>
 
 

test-compiler.py

@@ -18,7 +18,7 @@
 #
 
 from os import listdir, fdopen, system, remove, close
-from os.path import isdir
+from os.path import isdir, exists, join
 from subprocess import Popen, PIPE, STDOUT
 import sys
 
@@ -32,7 +32,9 @@
 		content = []
 		for dirname in listdir('.'):
 			if dirname[0].isupper() and isdir(dirname):
-				content.append('#import <{0}/{0}.h>'.format(dirname))
+				mainname = join(dirname, dirname + '.h')
+				if exists(mainname):
+					content.append('#import <{0}>'.format(mainname))
 			elif dirname[-2:] == '.h':
 				content.append('#import <{0}>'.format(dirname))
 		content_string = "\n".join(content).encode()