- Fixed GCC 4 warnings in FNodeBuilder::CreateSubsectorsForReal().
- Changed f_finale.cpp/atkstates[] into a static variable, since its anonymous type prevents it from being accessed from other files anyway. - Fixed: The behavior of the eventtail advancement in d_net.cpp/CheckAbort() was compiler-dependant. - Fixed warnings GCC 4 threw up while compiling re2c and lemon. - Removed __cdecl from makewad.c again. This is already defined as a builtin for MinGW, and redefining it produces a warning. (Why is main explicitly declared __cdecl anyway?) - Fixed building ccdv-win32 with GCC 4. GCC 4 creates a memcpy call, which won't work because it doesn't get linked with the standard C library. SVN r135 (trunk)
This commit is contained in:
parent
62b7dd3efc
commit
df799ade24
23 changed files with 2903 additions and 2158 deletions
|
|
@ -31,7 +31,7 @@
|
|||
**---------------------------------------------------------------------------
|
||||
**
|
||||
*/
|
||||
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define _WIN32_WINNT 0x0501
|
||||
#include <windows.h>
|
||||
|
|
@ -1005,16 +1005,16 @@ static void WriteBlock (HANDLE file, LPCVOID buffer, DWORD bytes, z_stream *stre
|
|||
stream->avail_in = bytes;
|
||||
*crc = crc32 (*crc, (const Bytef *)buffer, bytes);
|
||||
|
||||
while (stream->avail_in != 0)
|
||||
{
|
||||
if (stream->avail_out == 0)
|
||||
{
|
||||
stream->next_out = outbuf;
|
||||
stream->avail_out = sizeof(tar::record);
|
||||
WriteFile (file, outbuf, sizeof(tar::record), &bytes, NULL);
|
||||
}
|
||||
deflate (stream, Z_NO_FLUSH);
|
||||
}
|
||||
while (stream->avail_in != 0)
|
||||
{
|
||||
if (stream->avail_out == 0)
|
||||
{
|
||||
stream->next_out = outbuf;
|
||||
stream->avail_out = sizeof(tar::record);
|
||||
WriteFile (file, outbuf, sizeof(tar::record), &bytes, NULL);
|
||||
}
|
||||
deflate (stream, Z_NO_FLUSH);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2780,7 +2780,7 @@ void DisplayCrashLog ()
|
|||
{
|
||||
HINSTANCE riched;
|
||||
HANDLE file;
|
||||
bool gzipped;
|
||||
bool gzipped = false;
|
||||
|
||||
if (NumFiles == 0 || (riched = LoadLibrary ("riched20.dll")) == NULL)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue