eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / fs.h

diff --git a/fs.h b/fs.h
index 7e9192a593e1d78c6440669940f04b60611fab06..c86870f9e0c4fa5e6313aaace46d8fa4971c5660 100644 (file)
--- 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 size_t 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 size_t 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);
-size_t 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
@@ -69,8 +77,8 @@ fssearch_t;
 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, size_t len);
+unsigned char *FS_LoadFile (const char *path, mempool_t *pool, qboolean quiet);
+qboolean FS_WriteFile (const char *filename, void *data, fs_offset_t len);
 
 
 // ------ Other functions ------ //