Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compiler error about initializing const with default null #101

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions UIKit/Classes/UIStringDrawing.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ typedef enum {
UIBaselineAdjustmentNone,
} UIBaselineAdjustment;

NSString *const UITextAttributeFont;
NSString *const UITextAttributeTextColor;
NSString *const UITextAttributeTextShadowColor;
NSString *const UITextAttributeTextShadowOffset;
extern NSString *const UITextAttributeFont;
extern NSString *const UITextAttributeTextColor;
extern NSString *const UITextAttributeTextShadowColor;
extern NSString *const UITextAttributeTextShadowOffset;

@class UIFont;

Expand Down
7 changes: 2 additions & 5 deletions UIKit/UIKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,6 @@
INSTALL_PATH = "@executable_path/../Frameworks";
PRODUCT_NAME = UIKit;
SYMROOT = ../build;
VALID_ARCHS = "i386 x86_64";
WRAPPER_EXTENSION = framework;
};
name = Debug;
Expand All @@ -1376,15 +1375,14 @@
INSTALL_PATH = "@executable_path/../Frameworks";
PRODUCT_NAME = UIKit;
SYMROOT = ../build;
VALID_ARCHS = "i386 x86_64";
WRAPPER_EXTENSION = framework;
};
name = Release;
};
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
Expand All @@ -1399,8 +1397,7 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
Expand Down