Kaydet (Commit) 39080dfd authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Revert "Avoid confusion in 10.7 SDK headers in at least Xcode45-DP3"

Nah, don't bother going down this path for now, just require
max-allowed to be equal to the SDK version...

This reverts commit abf0ff68.

Change-Id: I0a3d765533866dad6bf604b1ebbfaef9e168f667
üst eb9d49e6
......@@ -65,7 +65,7 @@
# Checks for LibThai
--- misc/pango-1.28.3/pango/pangoatsui-fontmap.c
+++ misc/build/pango-1.28.3/pango/pangoatsui-fontmap.c
@@ -27,6 +27,17 @@
@@ -27,6 +27,12 @@
#include "pango-impl-utils.h"
#include "modules.h"
......@@ -74,18 +74,13 @@
+@class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 && MACOSX_SDK_VERSION >= 1070
+// Avoid a problem in at least the XCode 4.5DP3 SDK 10.7 headers
+#import <CoreData/NSPersistentStoreRequest.h>
+#endif
+
#import <Cocoa/Cocoa.h>
typedef struct _FontHashKey FontHashKey;
--- misc/pango-1.28.3/pango/pangocairo-atsuifont.c
+++ misc/build/pango-1.28.3/pango/pangocairo-atsuifont.c
@@ -22,6 +22,17 @@
@@ -22,6 +22,12 @@
#include "config.h"
......@@ -94,11 +89,6 @@
+@class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 && MACOSX_SDK_VERSION >= 1070
+// Avoid a problem in at least the XCode 4.5DP3 SDK 10.7 headers
+#import <CoreData/NSPersistentStoreRequest.h>
+#endif
+
#import <Cocoa/Cocoa.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment