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]
/
nucleus
/
library
/
basis
/
mutex.cpp
diff --git
a/nucleus/library/basis/mutex.cpp
b/nucleus/library/basis/mutex.cpp
index 3f19f7a5495e23976f5674bd28556009c4b393ea..fce0bed90b3052c40a9232d7c5510dca8995bcac 100644
(file)
--- a/
nucleus/library/basis/mutex.cpp
+++ b/
nucleus/library/basis/mutex.cpp
@@
-25,6
+25,8
@@
#include <pthread.h>
#endif
#ifdef __WIN32__
#include <pthread.h>
#endif
#ifdef __WIN32__
+ #include <synchapi.h>
+/*
#define _WINSOCKAPI_ // make windows.h happy about winsock.
// winsock support...
// #undef FD_SETSIZE
#define _WINSOCKAPI_ // make windows.h happy about winsock.
// winsock support...
// #undef FD_SETSIZE
@@
-32,6
+34,7
@@
// if you don't set this, you can only select on a default of 64 sockets.
#include <winsock2.h>
#include <windows.h>
// if you don't set this, you can only select on a default of 64 sockets.
#include <winsock2.h>
#include <windows.h>
+ */
#endif
namespace basis {
#endif
namespace basis {