diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
commit | 393f1b414746a7f1977971dd7659dd2b47092b11 (patch) | |
tree | 81d0ca1ee70ab86a7d79c1991abe5c387b655fb2 /src/compat/win32.cpp | |
parent | c259f95bd0e58b247940a339bb9b4b401b4e9438 (diff) | |
parent | 7e25a863325dc3e9762397e700030969e093b087 (diff) | |
download | libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.gz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.bz2 libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.xz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.zip |
Wow! Merged the branch, streams are updated, and there's no more FString, run
the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.
Diffstat (limited to '')
-rw-r--r-- | src/compat/win32.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compat/win32.cpp b/src/compat/win32.cpp index 052644a..b689322 100644 --- a/src/compat/win32.cpp +++ b/src/compat/win32.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -162,7 +162,7 @@ int Bu::Winsock2::__WSAFDIsSet( SOCKET s, fd_set *set ) { | |||
162 | return (*Bu::Winsock2::_fnptr___WSAFDIsSet)( s, set ); | 162 | return (*Bu::Winsock2::_fnptr___WSAFDIsSet)( s, set ); |
163 | } | 163 | } |
164 | 164 | ||
165 | Bu::FString Bu::getLastWinError() | 165 | Bu::String Bu::getLastWinError() |
166 | { | 166 | { |
167 | LPVOID lpMsgBuf; | 167 | LPVOID lpMsgBuf; |
168 | DWORD dw = GetLastError(); | 168 | DWORD dw = GetLastError(); |
@@ -177,7 +177,7 @@ Bu::FString Bu::getLastWinError() | |||
177 | (LPSTR) &lpMsgBuf, | 177 | (LPSTR) &lpMsgBuf, |
178 | 0, NULL ); | 178 | 0, NULL ); |
179 | 179 | ||
180 | Bu::FString sRet( (char *)lpMsgBuf ); | 180 | Bu::String sRet( (char *)lpMsgBuf ); |
181 | 181 | ||
182 | LocalFree(lpMsgBuf); | 182 | LocalFree(lpMsgBuf); |
183 | 183 | ||