From 5cc1bb74c3c70f6c98f819055a20474d457578dd Mon Sep 17 00:00:00 2001
From: Hoa Dinh <dvh@fb.com>
Date: Sat, 9 Feb 2019 23:17:33 -0800
Subject: [PATCH] Revert D14011897: rename FBMacros.h to FBDefines.h

Differential Revision:
D14011897

Original commit changeset: f1dd7e686eef

fbshipit-source-id: ccf548ec2f82c7a1e6c2a0df5d6fd8f9dc9e1538
---
 iOS/FBDefines/{FBDefines.h => FBMacros.h} |  0
 iOS/FlipperKit.podspec                    |  6 ++--
 iOS/FlipperKit/SKMacros.h                 | 38 ++++++++++++-----------
 3 files changed, 23 insertions(+), 21 deletions(-)
 rename iOS/FBDefines/{FBDefines.h => FBMacros.h} (100%)

diff --git a/iOS/FBDefines/FBDefines.h b/iOS/FBDefines/FBMacros.h
similarity index 100%
rename from iOS/FBDefines/FBDefines.h
rename to iOS/FBDefines/FBMacros.h
diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec
index 9d6bde150..d81692e9a 100644
--- a/iOS/FlipperKit.podspec
+++ b/iOS/FlipperKit.podspec
@@ -16,10 +16,10 @@ Pod::Spec.new do |spec|
   spec.platforms = { :ios => "8.4" }
   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
   # 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|
     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/FBDefines.h',
+                             'iOS/FBDefines/FBMacros.h',
                              'iOS/Plugins/FlipperKitExamplePlugin/FlipperKitExamplePlugin/FlipperKitExamplePlugin.h',
                              'iOS/Plugins/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin/FlipperKitCrashReporterPlugin.h',
                              'iOS/FlipperKit/**/{FlipperDiagnosticsViewController,FlipperStateUpdateListener,FlipperClient,FlipperPlugin,FlipperConnection,FlipperResponder,SKMacros}.h'
diff --git a/iOS/FlipperKit/SKMacros.h b/iOS/FlipperKit/SKMacros.h
index 24a7fe969..9b21bf1ea 100644
--- a/iOS/FlipperKit/SKMacros.h
+++ b/iOS/FlipperKit/SKMacros.h
@@ -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
-#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
+ #import <FBDefines/FBMacros.h>
 
-#define SKLog(...) NSLog(__VA_ARGS__)
-#define SKTrace(...) /*NSLog(__VA_ARGS__)*/
+ #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__)*/
 
 #endif