]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix two types to hopefulyl compile on MSVC
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 17 Oct 2010 14:15:06 +0000 (14:15 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 17 Oct 2010 16:20:32 +0000 (18:20 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10543 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1c76312b52aad3565537a423344fa4d9f543e6c3

crypto.c
netconn.c

index 896c3aa67ba5d915157532d0894d3ce8658bea15..f3bc8889f31dc2e9f3ae6b49343c7fd5d8872232 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -337,7 +337,7 @@ void sha256(unsigned char *out, const unsigned char *in, int n)
 static size_t Crypto_LoadFile(const char *path, char *buf, size_t nmax)
 {
        qfile_t *f = NULL;
-       ssize_t n;
+       fs_offset_t n;
        if(*fs_userdir)
                f = FS_SysOpen(va("%s%s", fs_userdir, path), "rb", false);
        if(!f)
index 73de1f4c532e37e6c4e350bba0988ecc3cbef4ff..dde22c22c34c28f1a28fe65349ec367bcb705f73 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -2285,7 +2285,7 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg
                        char *p;
                        const char *q;
                        p = qcstatus;
-                       for(q = str; *q && p - qcstatus < (ssize_t)(sizeof(qcstatus)) - 1; ++q)
+                       for(q = str; *q && p - qcstatus < (ptrdiff_t)(sizeof(qcstatus)) - 1; ++q)
                                if(*q != '\\' && *q != '\n')
                                        *p++ = *q;
                        *p = 0;