X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=fs.h;h=b0398d722582ccf192cb2500d74e18b78a1beec2;hp=e44a1e89eb641059d22977b2a025d4eb2c864aa5;hb=7c0a94ce469446d270191a82ceba736d867522d5;hpb=c8f47f4dddae69c6d3c6bc3e71fcc424938f36e3 diff --git a/fs.h b/fs.h index e44a1e89..b0398d72 100644 --- a/fs.h +++ b/fs.h @@ -30,13 +30,21 @@ typedef struct qfile_s qfile_t; +#ifdef WIN32 +typedef long fs_offset_t; // 32bit +//typedef _int64 fs_offset_t; // 64bit (lots of warnings, and lseek/read/write still don't take 64bit on win64) +#else +typedef long long fs_offset_t; +#endif + + // ------ Variables ------ // extern char fs_gamedir [MAX_OSPATH]; extern char fs_basedir [MAX_OSPATH]; -extern int fs_filesize; // set by FS_Open (in "read" mode) and FS_LoadFile +extern fs_offset_t fs_filesize; // set by FS_Open (in "read" mode) and FS_LoadFile // ------ Main functions ------ // @@ -46,15 +54,15 @@ extern int fs_filesize; // set by FS_Open (in "read" mode) and FS_LoadFile qfile_t *FS_Open (const char* filepath, const char* mode, qboolean quiet, qboolean nonblocking); int FS_Close (qfile_t* file); -size_t FS_Write (qfile_t* file, const void* data, size_t datasize); -size_t FS_Read (qfile_t* file, void* buffer, size_t buffersize); +fs_offset_t FS_Write (qfile_t* file, const void* data, size_t datasize); +fs_offset_t FS_Read (qfile_t* file, void* buffer, size_t buffersize); int FS_Print(qfile_t* file, const char *msg); int FS_Printf(qfile_t* file, const char* format, ...); int FS_VPrintf(qfile_t* file, const char* format, va_list ap); int FS_Getc (qfile_t* file); int FS_UnGetc (qfile_t* file, unsigned char c); -int FS_Seek (qfile_t* file, long offset, int whence); -long FS_Tell (qfile_t* file); +int FS_Seek (qfile_t* file, fs_offset_t offset, int whence); +fs_offset_t FS_Tell (qfile_t* file); void FS_Purge (qfile_t* file); typedef struct fssearch_s @@ -70,7 +78,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet); void FS_FreeSearch(fssearch_t *search); qbyte *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet); -qboolean FS_WriteFile (const char *filename, void *data, int len); +qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len); // ------ Other functions ------ //