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 <React/... BC break: Add ifndef surrounds to iOS headers #11614

Closed
wants to merge 3 commits into from
Closed
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
5 changes: 5 additions & 0 deletions Libraries/ART/ARTCGFloatArray.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTCGFLOATARRAY_H
#define ARTCGFLOATARRAY_H

// A little helper to make sure we have the right memory allocation ready for use.
// We assume that we will only this in one place so no reference counting is necessary.
// Needs to be freed when dealloced.
Expand All @@ -18,3 +21,5 @@ typedef struct {
size_t count;
CGFloat *array;
} ARTCGFloatArray;

#endif //ARTCGFLOATARRAY_H
5 changes: 5 additions & 0 deletions Libraries/ART/ARTContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTCONTAINER_H
#define ARTCONTAINER_H

#import <Foundation/Foundation.h>

@protocol ARTContainer <NSObject>
Expand All @@ -16,3 +19,5 @@
- (void)invalidate;

@end

#endif //ARTCONTAINER_H
5 changes: 5 additions & 0 deletions Libraries/ART/ARTGroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTGROUP_H
#define ARTGROUP_H

#import <Foundation/Foundation.h>

#import "ARTContainer.h"
Expand All @@ -17,3 +20,5 @@
@property (nonatomic, assign) CGRect clipping;

@end

#endif //ARTGROUP_H
5 changes: 5 additions & 0 deletions Libraries/ART/ARTNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTNODE_H
#define ARTNODE_H

#import <React/UIView+React.h>

/**
Expand All @@ -30,3 +33,5 @@
- (void)renderLayerTo:(CGContextRef)context;

@end

#endif //ARTNODE_H
5 changes: 5 additions & 0 deletions Libraries/ART/ARTRenderable.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTRENDERABLE_H
#define ARTRENDERABLE_H

#import <Foundation/Foundation.h>

#import "ARTBrush.h"
Expand All @@ -23,3 +26,5 @@
@property (nonatomic, assign) ARTCGFloatArray strokeDash;

@end

#endif //ARTRENDERABLE_H
5 changes: 5 additions & 0 deletions Libraries/ART/ARTShape.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTSHAPE_H
#define ARTSHAPE_H

#import <Foundation/Foundation.h>

#import "ARTRenderable.h"
Expand All @@ -16,3 +19,5 @@
@property (nonatomic, assign) CGPathRef d;

@end

#endif //ARTSHAPE_H
5 changes: 5 additions & 0 deletions Libraries/ART/ARTSurfaceView.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTSURFACEVIEW_H
#define ARTSURFACEVIEW_H

#import <UIKit/UIKit.h>

#import "ARTContainer.h"

@interface ARTSurfaceView : UIView <ARTContainer>

@end

#endif //ARTSURFACEVIEW_H
5 changes: 5 additions & 0 deletions Libraries/ART/ARTText.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTTEXT_H
#define ARTTEXT_H

#import <Foundation/Foundation.h>

#import "ARTRenderable.h"
Expand All @@ -18,3 +21,5 @@
@property (nonatomic, assign) ARTTextFrame textFrame;

@end

#endif //ARTTEXT_H
5 changes: 5 additions & 0 deletions Libraries/ART/ARTTextFrame.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTTEXTFRAME_H
#define ARTTEXTFRAME_H

#import <CoreText/CoreText.h>

// A little helper to make sure we have a set of lines including width ready for use.
Expand All @@ -23,3 +26,5 @@ typedef struct {
CTLineRef *lines;
CGFloat *widths; // Width of each line
} ARTTextFrame;

#endif //ARTTEXTFRAME_H
5 changes: 5 additions & 0 deletions Libraries/ART/Brushes/ARTBrush.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTBRUSH_H
#define ARTBRUSH_H

#import <CoreGraphics/CoreGraphics.h>
#import <Foundation/Foundation.h>

Expand All @@ -33,3 +36,5 @@
- (void)paint:(CGContextRef)context;

@end

#endif //ARTBRUSH_H
5 changes: 5 additions & 0 deletions Libraries/ART/Brushes/ARTLinearGradient.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTLINEARGRADIENT_H
#define ARTLINEARGRADIENT_H

#import "ARTBrush.h"

@interface ARTLinearGradient : ARTBrush

@end

#endif //ARTLINEARGRADIENT_H
5 changes: 5 additions & 0 deletions Libraries/ART/Brushes/ARTPattern.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTPATTERN_H
#define ARTPATTERN_H

#import "ARTBrush.h"

@interface ARTPattern : ARTBrush

@end

#endif //ARTPATTERN_H
5 changes: 5 additions & 0 deletions Libraries/ART/Brushes/ARTRadialGradient.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTRADIALGRADIENT_H
#define ARTRADIALGRADIENT_H

#import "ARTBrush.h"

@interface ARTRadialGradient : ARTBrush

@end

#endif //ARTRADIALGRADIENT_H
5 changes: 5 additions & 0 deletions Libraries/ART/Brushes/ARTSolidColor.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTSOLIDCOLOR_H
#define ARTSOLIDCOLOR_H

#import "ARTBrush.h"

@interface ARTSolidColor : ARTBrush

@end

#endif //ARTSOLIDCOLOR_H
5 changes: 5 additions & 0 deletions Libraries/ART/RCTConvert+ART.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef RCTCONVERT_ART_H
#define RCTCONVERT_ART_H

#import <QuartzCore/QuartzCore.h>

#import <React/RCTConvert.h>
Expand All @@ -29,3 +32,5 @@
+ (CGGradientRef)CGGradient:(id)json offset:(NSUInteger)offset;

@end

#endif //RCTCONVERT_ART_H
5 changes: 5 additions & 0 deletions Libraries/ART/ViewManagers/ARTGroupManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTGROUPMANAGER_H
#define ARTGROUPMANAGER_H

#import "ARTNodeManager.h"

@interface ARTGroupManager : ARTNodeManager

@end

#endif //ARTGROUPMANAGER_H
5 changes: 5 additions & 0 deletions Libraries/ART/ViewManagers/ARTNodeManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTNODEMANAGER_H
#define ARTNODEMANAGER_H

#import <React/RCTViewManager.h>

@class ARTNode;
Expand All @@ -16,3 +19,5 @@
- (ARTNode *)node;

@end

#endif //ARTNODEMANAGER_H
5 changes: 5 additions & 0 deletions Libraries/ART/ViewManagers/ARTRenderableManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTRENDERABLEMANAGER_H
#define ARTRENDERABLEMANAGER_H

#import "ARTNodeManager.h"
#import "ARTRenderable.h"

Expand All @@ -15,3 +18,5 @@
- (ARTRenderable *)node;

@end

#endif //ARTRENDERABLEMANAGER_H
5 changes: 5 additions & 0 deletions Libraries/ART/ViewManagers/ARTShapeManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTSHAPEMANAGER_H
#define ARTSHAPEMANAGER_H

#import "ARTRenderableManager.h"

@interface ARTShapeManager : ARTRenderableManager

@end

#endif //ARTSHAPEMANAGER_H
5 changes: 5 additions & 0 deletions Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTSURFACEVIEWMANAGER_H
#define ARTSURFACEVIEWMANAGER_H

#import <React/RCTViewManager.h>

@interface ARTSurfaceViewManager : RCTViewManager

@end

#endif //ARTSURFACEVIEWMANAGER_H
5 changes: 5 additions & 0 deletions Libraries/ART/ViewManagers/ARTTextManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef ARTTEXTMANAGER_H
#define ARTTEXTMANAGER_H

#import "ARTRenderableManager.h"

@interface ARTTextManager : ARTRenderableManager

@end

#endif //ARTTEXTMANAGER_H
5 changes: 5 additions & 0 deletions Libraries/ActionSheetIOS/RCTActionSheetManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef RCTACTIONSHEETMANAGER_H
#define RCTACTIONSHEETMANAGER_H

#import <UIKit/UIKit.h>

#import <React/RCTBridge.h>

@interface RCTActionSheetManager : NSObject <RCTBridgeModule>

@end

#endif //RCTACTIONSHEETMANAGER_H
5 changes: 5 additions & 0 deletions Libraries/AdSupport/RCTAdSupport.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef RCTADSUPPORT_H
#define RCTADSUPPORT_H

#import <React/RCTBridgeModule.h>

@interface RCTAdSupport : NSObject <RCTBridgeModule>

@end

#endif //RCTADSUPPORT_H
5 changes: 5 additions & 0 deletions Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef RCTASSETSLIBRARYREQUESTHANDLER_H
#define RCTASSETSLIBRARYREQUESTHANDLER_H

#import <React/RCTBridge.h>
#import <React/RCTURLRequestHandler.h>

Expand All @@ -24,3 +27,5 @@
@property (nonatomic, readonly) ALAssetsLibrary *assetsLibrary;

@end

#endif //RCTASSETSLIBRARYREQUESTHANDLER_H
5 changes: 5 additions & 0 deletions Libraries/CameraRoll/RCTCameraRollManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

#ifndef RCTCAMERAROLLMANAGER_H
#define RCTCAMERAROLLMANAGER_H

#import <AssetsLibrary/AssetsLibrary.h>

#import <React/RCTBridgeModule.h>
Expand All @@ -22,3 +25,5 @@
@interface RCTCameraRollManager : NSObject <RCTBridgeModule>

@end

#endif //RCTCAMERAROLLMANAGER_H
5 changes: 5 additions & 0 deletions Libraries/CameraRoll/RCTImagePickerManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,13 @@
*
*/

#ifndef RCTIMAGEPICKERMANAGER_H
#define RCTIMAGEPICKERMANAGER_H

#import <React/RCTBridgeModule.h>

@interface RCTImagePickerManager : NSObject <RCTBridgeModule>

@end

#endif //RCTIMAGEPICKERMANAGER_H
Loading