Changed typenames of the advertised file stuff.

Added unistd.h to include list.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPDExtra/trunk@10 61ea717e-8e0c-4c3c-b38e-e9c67f54f1f1

1 files changed, 8 insertions, 5 deletions

diff --git a/src/IO.c b/src/IO.c
index abc9a79..55ffbf4 100644
--- a/src/IO.c
+++ b/src/IO.c
@@ -15,10 +15,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include "util_String.h"
 
-#include "CactusBase/IOUtil/src/ioGH.h"
+#include "CactusBase/IOUtil/src/ioutil_AdvertisedFiles.h"
 
 #include "DevThorns/httpd/src/http_Request.h"
 #include "DevThorns/httpd/src/http_Content.h"
@@ -36,7 +39,7 @@ struct httpuFileList
   struct httpuFileList *next;
   char *filename;
   char *linkname;
-  IOUtil_AdvertisedFileDesc_t data;  
+  ioAdvertisedFileDesc data;  
 };
 
 struct httpuMimeType
@@ -50,7 +53,7 @@ struct httpuMimeType
  ********************************************************************/
 
 static int IOFileListener(cGH *GH, const char *filename,
-                          const IOUtil_AdvertisedFileDesc_t *description);
+                          const ioAdvertisedFileDesc *description);
 
 static int AdvertisedFilePage(cGH *cctkGH, httpRequest *request, void *data);
 static int ViewportFilePage(cGH *cctkGH, httpRequest *request, void *data);
@@ -74,7 +77,7 @@ static struct httpuMimeType *mimetypes  = NULL;
 
 int HTTP_util_RegisterIOPages(void)
 {
-  IOUtil_AdvertisedFileListenerCallbacks_t listener;
+  ioAdvertisedFileListenerCallbacks listener;
 
   listener.advertise = IOFileListener;
 
@@ -114,7 +117,7 @@ int HTTP_util_RegisterIOPages(void)
 
 @@*/
 static int IOFileListener(cGH *GH, const char *filename,
-                          const IOUtil_AdvertisedFileDesc_t *description)
+                          const ioAdvertisedFileDesc *description)
 {
   struct httpuFileList *entry;
   struct httpuMimeType *type;