Revert D14011897: rename FBMacros.h to FBDefines.h

Differential Revision:
D14011897

Original commit changeset: f1dd7e686eef

fbshipit-source-id: ccf548ec2f82c7a1e6c2a0df5d6fd8f9dc9e1538

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'

iOS/FlipperKit/SKMacros.h

@@ -1,13 +1,15 @@
-/**
- * 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.
+ *
  */
+
  #ifndef SKMACROS_H
  #define SKMACROS_H
 
-#import <FBDefines/FBDefines.h>
+ #import <FBDefines/FBMacros.h>
 
  #ifdef __cplusplus
  # define SK_EXTERN_C_BEGIN extern "C" {