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 34a3ee340201390e12b9dbf75475040869a5d799..f9f4fe2219543442624467fb83b5bf1fbadd2507 100644 (file)
--- 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 24ab64b4a6a23f90aadea273d098efb4613da46c..4e82c72a7a97ed73563217437faa7bbd1c1d2b7f 100644 (file)
--- 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