From 18084befa00b20a75601b67f60bf3063c9a8e1c2 Mon Sep 17 00:00:00 2001
From: Xavier Deguillard <xavierd@fb.com>
Date: Wed, 16 Sep 2020 12:29:25 -0700
Subject: [PATCH] win: remove fuse_init_out from Stub.h

Summary:
With this gone, we will be able to rename and move Stub.h outside of the win
directory.

Reviewed By: genevievehelsel

Differential Revision: D23696243

fbshipit-source-id: ea05b10951fa38a77ce38cd6a09a293364dbeec9
---
 eden/fs/inodes/EdenMount.cpp    | 1 -
 eden/fs/takeover/TakeoverData.h | 9 ++++++++-
 eden/fs/win/utils/Stub.h        | 6 ------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eden/fs/inodes/EdenMount.cpp b/eden/fs/inodes/EdenMount.cpp
index 5ee22d8169..55a2545853 100644
--- a/eden/fs/inodes/EdenMount.cpp
+++ b/eden/fs/inodes/EdenMount.cpp
@@ -1362,7 +1362,6 @@ void EdenMount::channelInitSuccessful(
             config_->getClientDirectory(),
             bindMounts,
             folly::File{},
-            fuse_init_out{},
             SerializedInodeMap{} // placeholder
             ));
 #else
diff --git a/eden/fs/takeover/TakeoverData.h b/eden/fs/takeover/TakeoverData.h
index cbbd020e02..8bfb88cf9b 100644
--- a/eden/fs/takeover/TakeoverData.h
+++ b/eden/fs/takeover/TakeoverData.h
@@ -90,20 +90,27 @@ class TakeoverData {
         AbsolutePathPiece stateDirectory,
         const std::vector<AbsolutePath>& bindMountPaths,
         folly::File fd,
+#ifndef _WIN32
         fuse_init_out connInfo,
+#endif
         SerializedInodeMap&& inodeMap)
         : mountPath{mountPath},
           stateDirectory{stateDirectory},
           bindMounts{bindMountPaths},
           fuseFD{std::move(fd)},
+#ifndef _WIN32
           connInfo{connInfo},
-          inodeMap{std::move(inodeMap)} {}
+#endif
+          inodeMap{std::move(inodeMap)} {
+    }
 
     AbsolutePath mountPath;
     AbsolutePath stateDirectory;
     std::vector<AbsolutePath> bindMounts;
     folly::File fuseFD;
+#ifndef _WIN32
     fuse_init_out connInfo;
+#endif
     SerializedInodeMap inodeMap;
   };
 
diff --git a/eden/fs/win/utils/Stub.h b/eden/fs/win/utils/Stub.h
index 7e586a1590..287382c7dd 100644
--- a/eden/fs/win/utils/Stub.h
+++ b/eden/fs/win/utils/Stub.h
@@ -8,12 +8,6 @@
 #pragma once
 #include "eden/fs/service/EdenError.h"
 
-// This is a stub to compile eden/service on Window.
-struct fuse_init_out {
-  uint32_t major;
-  uint32_t minor;
-};
-
 namespace facebook {
 namespace eden {