Merge commit '4645e19ce9e8f8034233ac965a4103a13b75714c' into garux-merge

[xonotic/netradiant.git] / tools / quake3 / common / vfs.h

diff --git a/tools/quake3/common/vfs.h b/tools/quake3/common/vfs.h
index 69f8a40a805de2c00e518d9377cfdeffbb7945b0..e47cadbaf41e061a6e794475d6afd697be85224b 100644 (file)
--- a/tools/quake3/common/vfs.h
+++ b/tools/quake3/common/vfs.h
@@ -31,19 +31,19 @@
 #ifndef _VFS_H_
 #define _VFS_H_
 
+#include "globaldefs.h"
+
 // to get PATH_MAX
 #include <stdio.h>
-#if defined ( __linux__ ) || defined ( __APPLE__ )
+#if GDEF_OS_LINUX || GDEF_OS_MACOS
 #include <dirent.h>
 #include <unistd.h>
 #else
 #include <wtypes.h>
 #include <io.h>
-#define R_OK 04
 #define S_ISDIR( mode ) ( mode & _S_IFDIR )
 #define PATH_MAX 260
 #endif
-#include <glib.h>
 
 #define VFS_MAXDIRS 64
 
@@ -51,8 +51,8 @@ void vfsInitDirectory( const char *path );
 void vfsShutdown();
 int vfsGetFileCount( const char *filename );
 int vfsLoadFile( const char *filename, void **buffer, int index );
-void vfsListShaderFiles( char list[512][64], int *num );
-qboolean vfsPackFile( const char *filename, const char *packname );
+void vfsListShaderFiles( char* list, int *num );
+qboolean vfsPackFile( const char *filename, const char *packname, const int compLevel );
 
 extern char g_strForbiddenDirs[VFS_MAXDIRS][PATH_MAX + 1];
 extern int g_numForbiddenDirs;