Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move winsock2.h into .cpp and add macro guard for pollfds #1588

Merged
merged 1 commit into from
Jan 30, 2019
Merged

move winsock2.h into .cpp and add macro guard for pollfds #1588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions utilities/xmlrpcpp/include/xmlrpcpp/XmlRpcServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
# include <map>
# include <string>
# include <vector>
# if defined(_WINDOWS)
# include <winsock2.h>
# else
# ifndef _WINDOWS
# include <poll.h>
# endif
#endif
Expand Down Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions utilities/xmlrpcpp/src/XmlRpcServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include <string.h>
#if !defined(_WINDOWS)
# include <sys/resource.h>
#else
# include <winsock2.h>
#endif

using namespace XmlRpc;
Expand Down