jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename FBMacros.h to FBDefines.h

Browse Source 
Summary:
Renaming FBMacros.h to FBDefines.h for more standard naming (similar to say UIKit/UIKit.h or Foundation/Foundation.h).

```
Tools/fastmod/fastmod --accept-all '\bFBMacros.h' FBDefines.h ../xplat
```

drop-conflicts
bypass-lint
allow-large-files

Reviewed By: adamjernst

Differential Revision: D14011897

fbshipit-source-id: f1dd7e686eef2cdb109e85c2db4a0f2ac3d0ba42
This commit is contained in:
Patrick Shyu
2019-02-09 16:47:03 -08:00
committed by Facebook Github Bot
parent 351ac37fab
commit 159061c284
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
iOS/FBDefines/FBMacros.h → iOS/FBDefines/FBDefines.h
View File

6
iOS/FlipperKit.podspec
View File

@@ -16,10 +16,10 @@ Pod::Spec.new do |spec|
spec.platforms = { :ios => "8.4" }
spec.default_subspecs = "Core"
# This subspec is necessary since FBMacros.h is imported as <FBDefines/FBMacros.h>
# This subspec is necessary since FBDefines.h is imported as <FBDefines/FBDefines.h>
# inside SKMacros.h, which is a public header file. Defining this directory as a
# subspec with header_dir = 'FBDefines' allows this to work, even though it wouldn't
# generally (you would need to import <FlipperKit/t/FBDefines/FBMacros.h>)
# generally (you would need to import <FlipperKit/t/FBDefines/FBDefines.h>)
spec.subspec 'FBDefines' do |ss|
ss.header_dir = 'FBDefines'
ss.compiler_flags = folly_compiler_flags
@@ -79,7 +79,7 @@ Pod::Spec.new do |spec|
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/SKDescriptorMapper.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/FlipperKitLayoutComponentKitSupport.h',
'iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKSubDescriptor.h',
'iOS/FBDefines/FBMacros.h',
'iOS/FBDefines/FBDefines.h',
'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h',
'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h',
'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h'

38
iOS/FlipperKit/SKMacros.h
View File

@@ -1,27 +1,25 @@
/*
* Copyright (c) 2004-present, Facebook, Inc.
*
* This source code is licensed under the MIT license found in the LICENSE
* file in the root directory of this source tree.
/**
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the LICENSE
* file in the root directory of this source tree.
*/
#ifndef SKMACROS_H
#define SKMACROS_H
#ifndef SKMACROS_H
#define SKMACROS_H
#import <FBDefines/FBDefines.h>
#import <FBDefines/FBMacros.h>
#ifdef __cplusplus
#define SK_EXTERN_C_BEGIN extern "C" {
#define SK_EXTERN_C_END }
#define SK_EXTERN_C extern "C"
#else
#define SK_EXTERN_C_BEGIN
#define SK_EXTERN_C_END
#define SK_EXTERN_C extern
#endif
#ifdef __cplusplus
# define SK_EXTERN_C_BEGIN extern "C" {
# define SK_EXTERN_C_END }
# define SK_EXTERN_C extern "C"
#else
# define SK_EXTERN_C_BEGIN
# define SK_EXTERN_C_END
# define SK_EXTERN_C extern
#endif
#define SKLog(...) NSLog(__VA_ARGS__)
#define SKTrace(...) /*NSLog(__VA_ARGS__)*/
#define SKLog(...) NSLog(__VA_ARGS__)
#define SKTrace(...) /*NSLog(__VA_ARGS__)*/
#endif