From 159061c284a47a58c8000a1c4df2dd46a7a8d581 Mon Sep 17 00:00:00 2001
From: Patrick Shyu <shyup@fb.com>
Date: Sat, 9 Feb 2019 16:47:03 -0800
Subject: [PATCH] rename FBMacros.h to FBDefines.h

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
---
 iOS/FBDefines/{FBMacros.h => FBDefines.h} |  0
 iOS/FlipperKit.podspec                    |  6 ++--
 iOS/FlipperKit/SKMacros.h                 | 38 +++++++++++------------
 3 files changed, 21 insertions(+), 23 deletions(-)
 rename iOS/FBDefines/{FBMacros.h => FBDefines.h} (100%)

diff --git a/iOS/FBDefines/FBMacros.h b/iOS/FBDefines/FBDefines.h
similarity index 100%
rename from iOS/FBDefines/FBMacros.h
rename to iOS/FBDefines/FBDefines.h
diff --git a/iOS/FlipperKit.podspec b/iOS/FlipperKit.podspec
index d81692e9a..9d6bde150 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 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'
diff --git a/iOS/FlipperKit/SKMacros.h b/iOS/FlipperKit/SKMacros.h
index 9b21bf1ea..24a7fe969 100644
--- a/iOS/FlipperKit/SKMacros.h
+++ b/iOS/FlipperKit/SKMacros.h
@@ -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