--- psiconv/trunk/program/psiconv/psiconv.h	1999/12/02 17:19:23	35
+++ psiconv/trunk/program/psiconv/psiconv.h	2002/05/10 15:55:55	147
@@ -20,11 +20,17 @@
 #ifndef PSICONV_PSICONV_H
 #define PSICONV_PSICONV_H
 
-#include "data.h"
+#include "psiconv/data.h"
 
-typedef int output_function(FILE *, const psiconv_file,const char *);
+#ifndef PSICONV_ENC_H
+#include "encoding.h"
+#endif
 
-typedef struct psiconv_fileformat {
+typedef int output_function(const char *filename, const psiconv_file,
+                            const char *type,
+			    const psiconv_encoding encoding_type);
+
+typedef struct psiconv_fileformat_s {
   const char *name;
   const char *description;
   output_function *output;