From e3e2bfbd75615b52231956285eeddc7fd2cf22c1 Mon Sep 17 00:00:00 2001
From: Sean Yen <seanyen@microsoft.com>
Date: Fri, 5 Oct 2018 14:35:15 -0700
Subject: [PATCH] Revert "move the winsock2.h into cpp."

This reverts commit de4268ad38ef0052d98c22417a0ca1f1bd38c4a3.
---
 utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h | 6 +++---
 utilities/xmlrpcpp/src/XmlRpcServer.cpp            | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h
index 0a64453caa..4b40794930 100644
--- a/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h
+++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h
@@ -15,7 +15,9 @@
 # include <map>
 # include <string>
 # include <vector>
-# ifndef _WINDOWS
+# if defined(_WINDOWS)
+#  include <winsock2.h>
+# else
 #  include <poll.h>
 # endif
 #endif
@@ -125,10 +127,8 @@ namespace XmlRpc {
 
     // Minimum number of free file descriptors before rejecting clients.
     static const int FREE_FD_BUFFER;
-#ifndef _WINDOWS
     // List of all file descriptors, used for counting open files.
     std::vector<struct pollfd> pollfds;
-#endif
   };
 } // namespace XmlRpc
 
diff --git a/utilities/xmlrpcpp/src/XmlRpcServer.cpp b/utilities/xmlrpcpp/src/XmlRpcServer.cpp
index af559441a9..bd252c27b7 100644
--- a/utilities/xmlrpcpp/src/XmlRpcServer.cpp
+++ b/utilities/xmlrpcpp/src/XmlRpcServer.cpp
@@ -13,8 +13,6 @@
 #include <string.h>
 #if !defined(_WINDOWS)
 # include <sys/resource.h>
-#else
-# include <winsock2.h>
 #endif
 
 using namespace XmlRpc;