mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-16 21:33:59 +02:00
Code Issues Projects Releases Wiki Activity

- bug fixes to stabilize the windows build

Browse Source
This commit is contained in:
Mark Vejvoda
2013-02-09 06:57:05 +00:00
parent f06f86904c
commit 9bc6d33f1d
15 changed files with 82 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/sources/graphics/video_player.cpp
View File

@@ -463,8 +463,9 @@ bool VideoPlayer::hasBackEndVideoPlayer() {
#ifdef HAS_LIBVLC
return true;
#endif
#else
return false;
#endif
}
void VideoPlayer::cleanupPlayer() {

6
source/shared_lib/sources/platform/posix/miniftpclient.cpp
View File

@@ -77,7 +77,7 @@ static size_t my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
removeFile(fullFilePath);
return -1;
return 0;
}
if(out && out->stream == NULL) {
@@ -94,7 +94,7 @@ static size_t my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> FTP Client thread FAILED to open file for writing [%s]\n",fullFilePath.c_str());
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"===> FTP Client thread FAILED to open file for writing [%s]\n",fullFilePath.c_str());
SystemFlags::OutputDebug(SystemFlags::debugError,"===> FTP Client thread FAILED to open file for writing [%s]\n",fullFilePath.c_str());
return -1; /* failure, can't open file to write */
return 0; /* failure, can't open file to write */
}
out->isValidXfer = true;
@@ -103,7 +103,7 @@ static size_t my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> #2 FTP Client thread FAILED to open file for writing [%s]\n",fullFilePath.c_str());
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"===> #2 FTP Client thread FAILED to open file for writing [%s]\n",fullFilePath.c_str());
SystemFlags::OutputDebug(SystemFlags::debugError,"===> #2 FTP Client thread FAILED to open file for writing [%s]\n",fullFilePath.c_str());
return -1; /* failure, can't open file to write */
return 0; /* failure, can't open file to write */
}
size_t result = fwrite(buffer, size, nmemb, out->stream);

10
source/shared_lib/sources/platform/posix/socket.cpp
View File

@@ -963,7 +963,7 @@ void Socket::disconnectSocket() {
sock = INVALID_SOCKET;
#else
::closesocket(sock);
sock = -1;
sock = INVALID_SOCKET;
#endif
}
safeMutex.ReleaseLock();
@@ -2036,7 +2036,7 @@ void BroadCastClientSocketThread::execute() {
bcfd = INVALID_SOCKET;
#else
::closesocket(bcfd);
bcfd = -1;
bcfd = INVALID_SOCKET;
#endif
}
@@ -2331,7 +2331,7 @@ Socket *ServerSocket::accept(bool errorOnFail) {
newSock = INVALID_SOCKET;
#else
::closesocket(newSock);
newSock = -1;
newSock = INVALID_SOCKET;
#endif
return NULL;
@@ -2773,7 +2773,7 @@ void BroadCastSocketThread::execute() {
#ifdef WIN32
bcfd[idx] = INVALID_SOCKET;
#else
bcfd[idx] = -1;
bcfd[idx] = INVALID_SOCKET;
#endif
//if(strlen(subnetmask[idx]) > 0) {
bcfd[idx] = socket( AF_INET, SOCK_DGRAM, 0 );
@@ -2867,7 +2867,7 @@ void BroadCastSocketThread::execute() {
bcfd[idx] = INVALID_SOCKET;
#else
::closesocket(bcfd[idx]);
bcfd[idx] = -1;
bcfd[idx] = INVALID_SOCKET;
#endif
}
}

2
source/shared_lib/sources/streflop/libm/flt-32/s_expm1f.cpp
View File

@@ -49,7 +49,7 @@ Q5 = -2.0109921195e-07f; /* 0xb457edbb */
Simple x;
#endif
{
Simple y,hi,lo,c,t,e,hxs,hfx,r1;
Simple y,hi,lo,c=0,t,e,hxs,hfx,r1;
int32_t k,xsb;
u_int32_t hx;

4
source/shared_lib/sources/streflop/libm/flt-32/s_log1pf.cpp
View File

@@ -51,8 +51,8 @@ static Simple zero = 0.0f;
Simple x;
#endif
{
Simple hfsq,f,c,s,z,R,u;
int32_t k,hx,hu,ax;
Simple hfsq,f=0,c=0,s,z,R,u;
int32_t k,hx,hu=0,ax;
GET_FLOAT_WORD(hx,x);
ax = hx&0x7fffffff;