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

Revert D14011897: rename FBMacros.h to FBDefines.h

Browse Source 
Differential Revision:
D14011897

Original commit changeset: f1dd7e686eef

fbshipit-source-id: ccf548ec2f82c7a1e6c2a0df5d6fd8f9dc9e1538
This commit is contained in:
Hoa Dinh
2019-02-09 23:17:33 -08:00
committed by Facebook Github Bot
parent 159061c284
commit 5cc1bb74c3
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

6
iOS/FlipperKit.podspec
View File

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

38
iOS/FlipperKit/SKMacros.h
View File

@@ -1,25 +1,27 @@
/** /*
* Copyright (c) Facebook, Inc. and its affiliates. * 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.
* *
* 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
#import <FBDefines/FBDefines.h> #ifndef SKMACROS_H
#define SKMACROS_H
#ifdef __cplusplus #import <FBDefines/FBMacros.h>
#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__) #ifdef __cplusplus
#define SKTrace(...) /*NSLog(__VA_ARGS__)*/ # 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__)*/
#endif #endif