--- a/src/xs_support.h	Tue Jan 30 10:01:04 2007 +0000
+++ b/src/xs_support.h	Tue Feb 06 02:32:00 2007 +0000
@@ -36,20 +36,33 @@
 #endif
 
 
+/* VFS replacement functions
+ */
+#ifdef __AUDACIOUS_NEWVFS__
+#define t_xs_file VFSFile
+#define xs_fopen(a,b) vfs_fopen(a,b)
+#define xs_fclose(a) vfs_fclose(a)
+#define xs_fgetc(a) vfs_getc(a)
+#define xs_fread(a,b,c,d) vfs_fread(a,b,c,d)
+#define xs_feof(a) vfs_feof(a)
+#define xs_ferror(a) (0)
+#define xs_ftell(a) vfs_ftell(a)
+#else
 #define t_xs_file FILE
-
-
-/* Functions
- */
 t_xs_file *xs_fopen(const gchar *, const gchar *);
 gint	xs_fclose(t_xs_file *);
 gint	xs_fgetc(t_xs_file *);
-guint16 xs_fread_be16(t_xs_file *);
-guint32 xs_fread_be32(t_xs_file *);
 size_t	xs_fread(void *, size_t, size_t, t_xs_file *);
 gint	xs_feof(t_xs_file *);
 gint	xs_ferror(t_xs_file *);
+glong	xs_ftell(t_xs_file *);
+#endif
+guint16 xs_fread_be16(t_xs_file *);
+guint32 xs_fread_be32(t_xs_file *);
 
+
+/* Misc functions
+ */
 gchar	*xs_strncpy(gchar *, gchar *, size_t);
 gint	xs_pstrcpy(gchar **, const gchar *);
 gint	xs_pstrcat(gchar **, const gchar *);