break the folly/Portability.h dependency on SysTypes.h

Summary: Portability.h does not need to include SysTypes.h. This avoids bringing in basetsd.h and some non-portable typedefs in typical code that just wants to use Folly. Reviewed By: Gownta Differential Revision: D42044843 fbshipit-source-id: 27ba1c5298d936c85a03f0b5159259f8f31fc693
facebook · Aug 10, 2023 · d969a5c · d969a5c
1 parent cb4d204
commit d969a5c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 3 deletions.
diff --git a/folly/Exception.h b/folly/Exception.h
@@ -26,6 +26,7 @@
 #include <folly/FBString.h>
 #include <folly/Likely.h>
 #include <folly/Portability.h>
+#include <folly/portability/SysTypes.h>
 
 namespace folly {
 

diff --git a/folly/Portability.h b/folly/Portability.h
@@ -202,7 +202,6 @@ constexpr bool kIsSanitize = false;
 // MSVC specific defines
 // mainly for posix compat
 #ifdef _MSC_VER
-#include <folly/portability/SysTypes.h>
 
 // We have compiler support for the newest of the new, but
 // MSVC doesn't tell us that.

diff --git a/folly/executors/ExecutorWithPriority-inl.h b/folly/executors/ExecutorWithPriority-inl.h
@@ -57,7 +57,7 @@ class ExecutorWithPriorityImpl : public virtual Executor {
   ExecutorWithPriorityImpl(
       Executor::KeepAlive<Executor> executor, Callback&& callback)
       : executor_(std::move(executor)), callback_(std::move(callback)) {}
-  std::atomic<ssize_t> keepAliveCounter_{1};
+  std::atomic<int64_t> keepAliveCounter_{1};
   Executor::KeepAlive<Executor> executor_;
   Callback callback_;
 };

diff --git a/folly/experimental/JemallocHugePageAllocator.cpp b/folly/experimental/JemallocHugePageAllocator.cpp
@@ -21,6 +21,7 @@
 #include <folly/portability/Malloc.h>
 #include <folly/portability/String.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/SysTypes.h>
 
 #include <glog/logging.h>
 

diff --git a/folly/logging/LogName.cpp b/folly/logging/LogName.cpp
@@ -129,7 +129,7 @@ StringPiece LogName::getParent(StringPiece name) {
     return name;
   }
 
-  ssize_t idx = name.size();
+  size_t idx = name.size();
 
   // Skip over any trailing separator characters
   while (idx > 0 && isSeparator(name[idx - 1])) {

diff --git a/folly/system/AtFork.h b/folly/system/AtFork.h
@@ -23,6 +23,7 @@
 #include <mutex>
 
 #include <folly/Function.h>
+#include <folly/portability/SysTypes.h>
 
 namespace folly {