From 36916ee99d60a744f6249ed1347cd2a071521a65 Mon Sep 17 00:00:00 2001
From: Matt Hargett <plaztiksyke@gmail.com>
Date: Thu, 31 Jan 2019 17:41:46 -0800
Subject: [PATCH] Fix portability issues to Linux, FreeBSD, and older libc++

Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/21764

Differential Revision: D13902907

Pulled By: hramos

fbshipit-source-id: 640cde865b1bcc5ca43c17d00574b8e2f78ceaf4
---
 .../src/main/jni/react/jni/CatalystInstanceImpl.cpp         | 2 +-
 ReactCommon/cxxreact/Instance.cpp                           | 1 -
 ReactCommon/cxxreact/JSBigString.h                          | 1 +
 ReactCommon/cxxreact/JSExecutor.h                           | 3 +--
 ReactCommon/cxxreact/JsArgumentHelpers-inl.h                | 1 +
 ReactCommon/cxxreact/NativeToJsBridge.cpp                   | 1 +
 ReactCommon/jsi/JSCRuntime.cpp                              | 6 +++++-
 ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp            | 1 +
 ReactCommon/microprofiler/MicroProfiler.cpp                 | 3 ++-
 9 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
index d5acc2367..db4e0aa49 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -153,7 +153,7 @@ void CatalystInstanceImpl::initializeBridge(
        moduleMessageQueue_));
 
   instance_->initializeBridge(
-    folly::make_unique<JInstanceCallback>(
+    std::make_unique<JInstanceCallback>(
     callback,
     moduleMessageQueue_),
     jseh->getExecutorFactory(),
diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp
index 23723fbbe..a9b6bd562 100644
--- a/ReactCommon/cxxreact/Instance.cpp
+++ b/ReactCommon/cxxreact/Instance.cpp
@@ -43,7 +43,6 @@ void Instance::initializeBridge(
     std::shared_ptr<ModuleRegistry> moduleRegistry) {
   callback_ = std::move(callback);
   moduleRegistry_ = std::move(moduleRegistry);
-
   jsQueue->runOnQueueSync([this, &jsef, jsQueue]() mutable {
     nativeToJsBridge_ = folly::make_unique<NativeToJsBridge>(
         jsef.get(), moduleRegistry_, jsQueue, callback_);
diff --git a/ReactCommon/cxxreact/JSBigString.h b/ReactCommon/cxxreact/JSBigString.h
index e3cc5af29..55bc7e8ed 100644
--- a/ReactCommon/cxxreact/JSBigString.h
+++ b/ReactCommon/cxxreact/JSBigString.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <fcntl.h>
+#include <unistd.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
diff --git a/ReactCommon/cxxreact/JSExecutor.h b/ReactCommon/cxxreact/JSExecutor.h
index c5069df30..4e8d682c0 100644
--- a/ReactCommon/cxxreact/JSExecutor.h
+++ b/ReactCommon/cxxreact/JSExecutor.h
@@ -82,8 +82,7 @@ public:
    */
   virtual void invokeCallback(const double callbackId, const folly::dynamic& arguments) = 0;
 
-  virtual void setGlobalVariable(std::string propName,
-                                 std::unique_ptr<const JSBigString> jsonValue) = 0;
+  virtual void setGlobalVariable(std::string propName, std::unique_ptr<const JSBigString> jsonValue) = 0;
 
   virtual void* getJavaScriptContext() {
     return nullptr;
diff --git a/ReactCommon/cxxreact/JsArgumentHelpers-inl.h b/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
index f5877556b..eaea3d1a0 100644
--- a/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
+++ b/ReactCommon/cxxreact/JsArgumentHelpers-inl.h
@@ -4,6 +4,7 @@
 // LICENSE file in the root directory of this source tree.
 
 #pragma once
+#include <folly/dynamic.h>
 
 namespace facebook {
 namespace xplat {
diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp
index 4cb428d97..b5401267d 100644
--- a/ReactCommon/cxxreact/NativeToJsBridge.cpp
+++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp
@@ -103,6 +103,7 @@ void NativeToJsBridge::loadApplication(
     std::unique_ptr<RAMBundleRegistry> bundleRegistry,
     std::unique_ptr<const JSBigString> startupScript,
     std::string startupScriptSourceURL) {
+
   runOnExecutorQueue(
       [this,
        bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
diff --git a/ReactCommon/jsi/JSCRuntime.cpp b/ReactCommon/jsi/JSCRuntime.cpp
index 92b1ac385..b1cbc68cd 100644
--- a/ReactCommon/jsi/JSCRuntime.cpp
+++ b/ReactCommon/jsi/JSCRuntime.cpp
@@ -200,7 +200,11 @@ class JSCRuntime : public jsi::Runtime {
 #endif
 };
 
-#if __has_builtin(__builtin_expect)
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
+
+#if __has_builtin(__builtin_expect) || defined(__GNUC__)
 #define JSC_LIKELY(EXPR) __builtin_expect((bool)(EXPR), true)
 #define JSC_UNLIKELY(EXPR) __builtin_expect((bool)(EXPR), false)
 #else
diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
index dbb9560ca..15414107b 100644
--- a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
+++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
@@ -14,6 +14,7 @@
 #include <glog/logging.h>
 #include <jsi/JSIDynamic.h>
 
+#include <sstream>
 #include <stdexcept>
 
 using namespace facebook::jsi;
diff --git a/ReactCommon/microprofiler/MicroProfiler.cpp b/ReactCommon/microprofiler/MicroProfiler.cpp
index 8bee8cd75..f20b3315c 100644
--- a/ReactCommon/microprofiler/MicroProfiler.cpp
+++ b/ReactCommon/microprofiler/MicroProfiler.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <chrono>
 #include <mutex>
+#include <sstream>
 #include <vector>
 #include <time.h>
 
@@ -17,7 +18,7 @@
 // we can get rid of this
 #if defined(__APPLE__)
 #define MICRO_PROFILER_STUB_IMPLEMENTATION 1
-#else
+#elif !defined(MICRO_PROFILER_STUB_IMPLEMENTATION)
 #define MICRO_PROFILER_STUB_IMPLEMENTATION 0
 #endif