diff options
author | Mike Buland <eichlan@xagasoft.com> | 2012-08-28 17:42:54 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2012-08-28 17:42:54 +0000 |
commit | 411cdf39fc2b961a970a0ae91b9059614251247e (patch) | |
tree | 935afa56c11aef0fb769e63659970e7d033a99e8 /src/compat | |
parent | fc5132d68ae9e6afdbd0b5a687ba81c88fc84826 (diff) | |
download | libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.gz libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.bz2 libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.xz libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.zip |
Loads of win32 compilation issues fixed. Most are fairly minor unsigned/signed
mismatches because of socket handles, but there were also some
order-of-definition issues that were fixed in the FD_SETSIZE definition code.
Fixed a few things that just never worked on windows, like Bu::Thread::yield().
Diffstat (limited to 'src/compat')
-rw-r--r-- | src/compat/win32.cpp | 4 | ||||
-rw-r--r-- | src/compat/win32.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compat/win32.cpp b/src/compat/win32.cpp index 6488d5f..e1151b0 100644 --- a/src/compat/win32.cpp +++ b/src/compat/win32.cpp | |||
@@ -12,7 +12,7 @@ | |||
12 | #define deffunc( name ) \ | 12 | #define deffunc( name ) \ |
13 | Bu::Winsock2::FNDEF_DYN_ ##name Bu::Winsock2::_fnptr_ ##name = NULL | 13 | Bu::Winsock2::FNDEF_DYN_ ##name Bu::Winsock2::_fnptr_ ##name = NULL |
14 | 14 | ||
15 | char Bu::Winsock2::scode[15]; | 15 | char Bu::Winsock2::scode[32]; |
16 | 16 | ||
17 | deffunc( WSAStartup ); | 17 | deffunc( WSAStartup ); |
18 | deffunc( WSACleanup ); | 18 | deffunc( WSACleanup ); |
@@ -85,7 +85,7 @@ Bu::Winsock2::~Winsock2() | |||
85 | 85 | ||
86 | char *Bu::Winsock2::gai_strerror( int iCode ) | 86 | char *Bu::Winsock2::gai_strerror( int iCode ) |
87 | { | 87 | { |
88 | sprintf( scode, "%d", Bu::Winsock2::WSAGetLastError() ); | 88 | sprintf( scode, "%d (%d)", iCode, Bu::Winsock2::WSAGetLastError() ); |
89 | return scode; | 89 | return scode; |
90 | } | 90 | } |
91 | 91 | ||
diff --git a/src/compat/win32.h b/src/compat/win32.h index 512e6d3..7e44c13 100644 --- a/src/compat/win32.h +++ b/src/compat/win32.h | |||
@@ -87,7 +87,7 @@ namespace Bu | |||
87 | decltype( int, send, SOCKET s, const char *buf, int len, int flags ); | 87 | decltype( int, send, SOCKET s, const char *buf, int len, int flags ); |
88 | decltype( int, __WSAFDIsSet, SOCKET s, fd_set *set ); | 88 | decltype( int, __WSAFDIsSet, SOCKET s, fd_set *set ); |
89 | 89 | ||
90 | static char scode[15]; | 90 | static char scode[32]; |
91 | static char *gai_strerror( int iCode ); | 91 | static char *gai_strerror( int iCode ); |
92 | }; | 92 | }; |
93 | 93 | ||