Revert "Revert "move the winsock2.h into cpp."" (ros#1588)

This reverts commit e3e2bfb.
tahsinkose · Apr 15, 2019 · cb04f81 · cb04f81
1 parent 998ba3e
commit cb04f81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h
@@ -15,9 +15,7 @@
 # include <map>
 # include <string>
 # include <vector>
-# if defined(_WINDOWS)
-#  include <winsock2.h>
-# else
+# ifndef _WINDOWS
 #  include <poll.h>
 # endif
 #endif
@@ -127,8 +125,10 @@ 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
@@ -13,6 +13,8 @@
 #include <string.h>
 #if !defined(_WINDOWS)
 # include <sys/resource.h>
+#else
+# include <winsock2.h>
 #endif
 
 using namespace XmlRpc;