From: havoc Date: Tue, 5 Jul 2005 12:56:54 +0000 (+0000) Subject: more fixes X-Git-Tag: xonotic-v0.1.0preview~4683 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ccb3fb85096674f7bde0d7323946b03c005272a;p=xonotic%2Fdarkplaces.git more fixes git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5503 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/cl_screen.c b/cl_screen.c index 34a3ee34..f9f4fe22 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -1087,7 +1087,7 @@ void SCR_CaptureVideo_SoundFrame(qbyte *bufstereo16le, size_t length, int rate) if (!cl_capturevideo_soundfile) return; cl_capturevideo_soundrate = rate; - if (FS_Write (cl_capturevideo_soundfile, bufstereo16le, 4 * length) < 4 * length) + if (FS_Write (cl_capturevideo_soundfile, bufstereo16le, 4 * length) < (fs_offset_t)(4 * length)) { Cvar_SetValueQuick(&cl_capturevideo, 0); Con_Printf("video sound saving failed on frame %i, out of disk space? stopping video capture.\n", cl_capturevideo_frame); diff --git a/qtypes.h b/qtypes.h index 24ab64b4..4e82c72a 100644 --- a/qtypes.h +++ b/qtypes.h @@ -9,9 +9,7 @@ typedef unsigned char qbyte; typedef enum {false, true} qboolean; -#ifdef WIN64 -# define ssize_t long long -#elifdef WIN32 +#if defined(WIN32) && !defined(WIN64) # define ssize_t long #endif