From b128eaeea407b5aeff8682bd2559af6bd93817d6 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 24 Dec 2009 17:06:38 +0000 Subject: [PATCH] don't use ssize_t removed ssize_t from qtypes.h git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9680 d7cf8633-e32d-0410-b094-e92efae38249 --- fs.c | 2 +- prvm_edict.c | 2 +- qtypes.h | 4 ---- sys_linux.c | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/fs.c b/fs.c index 8092ee1f..273b0898 100644 --- a/fs.c +++ b/fs.c @@ -549,7 +549,7 @@ int PK3_BuildFileList (pack_t *pack, const pk3_endOfCentralDir_t *eocd) // Load the central directory in memory central_dir = (unsigned char *)Mem_Alloc (tempmempool, eocd->cdir_size); lseek (pack->handle, eocd->cdir_offset, SEEK_SET); - if(read (pack->handle, central_dir, eocd->cdir_size) != (ssize_t) eocd->cdir_size) + if(read (pack->handle, central_dir, eocd->cdir_size) != (fs_offset_t) eocd->cdir_size) { Mem_Free (central_dir); return -1; diff --git a/prvm_edict.c b/prvm_edict.c index eff8d5ac..dbbff6a8 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -1928,7 +1928,7 @@ po_t *PRVM_PO_Load(const char *filename, mempool_t *pool) --q; if(*(q-1) != '"') break; - if(q - p >= (ssize_t) sizeof(inbuf)) + if((size_t)(q - p) >= (size_t) sizeof(inbuf)) break; strlcpy(inbuf, p, q - p); // not - 1, because this adds a NUL PRVM_PO_ParseString(decodedbuf + decodedpos, inbuf, sizeof(decodedbuf) - decodedpos); diff --git a/qtypes.h b/qtypes.h index a9457857..3a481cae 100644 --- a/qtypes.h +++ b/qtypes.h @@ -11,10 +11,6 @@ typedef enum qboolean_e {false, true} qboolean; typedef bool qboolean; #endif -#if defined(WIN32) -# define ssize_t long -#endif - #ifndef NULL #define NULL ((void *)0) #endif diff --git a/sys_linux.c b/sys_linux.c index 6df93c5e..c274cf3b 100644 --- a/sys_linux.c +++ b/sys_linux.c @@ -71,7 +71,7 @@ void Sys_PrintToTerminal(const char *text) #endif while(*text) { - ssize_t written = write(1, text, strlen(text)); + fs_offset_t written = (fs_offset_t)write(1, text, strlen(text)); if(written <= 0) break; // sorry, I cannot do anything about this error - without an output text += written; -- 2.39.2