projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.136'
[feisty_meow.git]
/
octopi
/
library
/
sockets
/
socket_minder.cpp
diff --git
a/octopi/library/sockets/socket_minder.cpp
b/octopi/library/sockets/socket_minder.cpp
index e4fc5511fdd937fd2ead375d99de3807fa1f0d8d..8c7036bdd1ac5b0a005b09ff48f00b06737a2fae 100644
(file)
--- a/
octopi/library/sockets/socket_minder.cpp
+++ b/
octopi/library/sockets/socket_minder.cpp
@@
-28,13
+28,14
@@
#include <textual/parser_bits.h>
#include <errno.h>
#include <textual/parser_bits.h>
#include <errno.h>
-#ifdef __WIN32__
+
/*
#ifdef __WIN32__
#include <ws2tcpip.h>
#endif
#ifdef __UNIX__
#include <ws2tcpip.h>
#endif
#ifdef __UNIX__
+*/
#include <arpa/inet.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/socket.h>
-#endif
+
//
#endif
using namespace basis;
using namespace loggers;
using namespace basis;
using namespace loggers;