--- a/src/archiver_dir.c	Sat Mar 24 15:06:28 2012 -0400
+++ b/src/archiver_dir.c	Sun Mar 25 14:52:24 2012 -0400
@@ -66,7 +66,7 @@
 } /* DIR_openArchive */
 
 
-static void DIR_enumerateFiles(dvoid *opaque, const char *dname,
+static void DIR_enumerateFiles(PHYSFS_Dir *opaque, const char *dname,
                                int omitSymLinks, PHYSFS_EnumFilesCallback cb,
                                const char *origdir, void *callbackdata)
 {
@@ -82,7 +82,7 @@
 } /* DIR_enumerateFiles */
 
 
-static PHYSFS_Io *doOpen(dvoid *opaque, const char *name,
+static PHYSFS_Io *doOpen(PHYSFS_Dir *opaque, const char *name,
                          const int mode, int *fileExists)
 {
     char *f;
@@ -114,25 +114,25 @@
 } /* doOpen */
 
 
-static PHYSFS_Io *DIR_openRead(dvoid *opaque, const char *fnm, int *exist)
+static PHYSFS_Io *DIR_openRead(PHYSFS_Dir *opaque, const char *fnm, int *exist)
 {
     return doOpen(opaque, fnm, 'r', exist);
 } /* DIR_openRead */
 
 
-static PHYSFS_Io *DIR_openWrite(dvoid *opaque, const char *filename)
+static PHYSFS_Io *DIR_openWrite(PHYSFS_Dir *opaque, const char *filename)
 {
     return doOpen(opaque, filename, 'w', NULL);
 } /* DIR_openWrite */
 
 
-static PHYSFS_Io *DIR_openAppend(dvoid *opaque, const char *filename)
+static PHYSFS_Io *DIR_openAppend(PHYSFS_Dir *opaque, const char *filename)
 {
     return doOpen(opaque, filename, 'a', NULL);
 } /* DIR_openAppend */
 
 
-static int DIR_remove(dvoid *opaque, const char *name)
+static int DIR_remove(PHYSFS_Dir *opaque, const char *name)
 {
     int retval;
     char *f;
@@ -145,7 +145,7 @@
 } /* DIR_remove */
 
 
-static int DIR_mkdir(dvoid *opaque, const char *name)
+static int DIR_mkdir(PHYSFS_Dir *opaque, const char *name)
 {
     int retval;
     char *f;
@@ -158,14 +158,14 @@
 } /* DIR_mkdir */
 
 
-static void DIR_closeArchive(dvoid *opaque)
+static void DIR_closeArchive(PHYSFS_Dir *opaque)
 {
     allocator.Free(opaque);
 } /* DIR_closeArchive */
 
 
-static int DIR_stat(dvoid *opaque, const char *name, int *exists,
-                    PHYSFS_Stat *stat)
+static int DIR_stat(PHYSFS_Dir *opaque, const char *name,
+                    int *exists, PHYSFS_Stat *stat)
 {
     int retval = 0;
     char *d;