From de4268ad38ef0052d98c22417a0ca1f1bd38c4a3 Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Fri, 5 Oct 2018 11:43:55 -0700 Subject: [PATCH] move the winsock2.h into cpp. --- utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h | 6 +++--- utilities/xmlrpcpp/src/XmlRpcServer.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h index 4b40794930..0a64453caa 100644 --- a/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h +++ b/utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h @@ -15,9 +15,7 @@ # include # include # include -# if defined(_WINDOWS) -# include -# else +# ifndef _WINDOWS # include # 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 pollfds; +#endif }; } // namespace XmlRpc diff --git a/utilities/xmlrpcpp/src/XmlRpcServer.cpp b/utilities/xmlrpcpp/src/XmlRpcServer.cpp index bd252c27b7..af559441a9 100644 --- a/utilities/xmlrpcpp/src/XmlRpcServer.cpp +++ b/utilities/xmlrpcpp/src/XmlRpcServer.cpp @@ -13,6 +13,8 @@ #include #if !defined(_WINDOWS) # include +#else +# include #endif using namespace XmlRpc;