Wasm folly io/net compilation fixes

Summary: We have a wasm project compilation broken. This is one of the required fixes. It normalizes types for emcc. Reviewed By: EricGriffith Differential Revision: D40398649 fbshipit-source-id: ee67bf0eb840a24aec9f8b9f9c56ae4d282b6ac8
facebook · Oct 23, 2022 · de84911 · de84911
1 parent 352c7ce
commit de84911
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/folly/net/NetworkSocket.h b/folly/net/NetworkSocket.h
@@ -33,9 +33,6 @@ struct NetworkSocket {
 #ifdef _WIN32
   using native_handle_type = SOCKET;
   static constexpr native_handle_type invalid_handle_value = INVALID_SOCKET;
-#elif defined(__EMSCRIPTEN__)
-  using native_handle_type = void*;
-  static constexpr native_handle_type invalid_handle_value = nullptr;
 #else
   using native_handle_type = int;
   static constexpr native_handle_type invalid_handle_value = -1;

diff --git a/folly/net/detail/SocketFileDescriptorMap.cpp b/folly/net/detail/SocketFileDescriptorMap.cpp
@@ -171,15 +171,11 @@ int SocketFileDescriptorMap::close(int fd) noexcept {
   std::terminate();
 }
 
-int SocketFileDescriptorMap::close(void* sock) noexcept {
+int SocketFileDescriptorMap::fdToSocket(int fd) noexcept {
   std::terminate();
 }
 
-void* SocketFileDescriptorMap::fdToSocket(int fd) noexcept {
-  std::terminate();
-}
-
-int SocketFileDescriptorMap::socketToFd(void* sock) noexcept {
+int SocketFileDescriptorMap::socketToFd(int sock) noexcept {
   std::terminate();
 }
 

diff --git a/folly/net/detail/SocketFileDescriptorMap.h b/folly/net/detail/SocketFileDescriptorMap.h
@@ -36,10 +36,9 @@ struct SocketFileDescriptorMap {
   static int socketToFd(SOCKET sock) noexcept;
 #elif defined(__EMSCRIPTEN__)
   static int close(int fd) noexcept;
-  static int close(void* sock) noexcept;
 
-  static void* fdToSocket(int fd) noexcept;
-  static int socketToFd(void* sock) noexcept;
+  static int fdToSocket(int fd) noexcept;
+  static int socketToFd(int sock) noexcept;
 #else
   static int close(int fd) noexcept { return ::close(fd); }