projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
split versions for cygwin vs visual studio in ioctlsocket
[feisty_meow.git]
/
octopi
/
library
/
sockets
/
raw_socket.cpp
diff --git
a/octopi/library/sockets/raw_socket.cpp
b/octopi/library/sockets/raw_socket.cpp
index 5bc2a87efac523fd7443040f1f16500e423117c0..9b750e2ff4dedf0bf47ff268a49c20422ac31ac4 100644
(file)
--- a/
octopi/library/sockets/raw_socket.cpp
+++ b/
octopi/library/sockets/raw_socket.cpp
@@
-126,7
+126,11
@@
int raw_socket::ioctl(basis::un_int socket, int request, void *argp) const
return ::ioctl(socket, request, argp);
#endif
#ifdef __WIN32__
return ::ioctl(socket, request, argp);
#endif
#ifdef __WIN32__
- return ioctlsocket(socket, request, (un_int *)argp);
+ #ifdef _MSC_VER
+ return ioctlsocket(socket, request, (un_long *)argp);
+ #else
+ return ioctlsocket(socket, request, (un_int *)argp);
+ #endif
#endif
}
#endif
}