--- psiconv/trunk/program/psiconv/psiconv.h 2000/12/10 15:44:40 56 +++ psiconv/trunk/program/psiconv/psiconv.h 2002/05/10 15:55:55 147 @@ -20,10 +20,15 @@ #ifndef PSICONV_PSICONV_H #define PSICONV_PSICONV_H -#include "data.h" +#include "psiconv/data.h" + +#ifndef PSICONV_ENC_H +#include "encoding.h" +#endif typedef int output_function(const char *filename, const psiconv_file, - const char *type); + const char *type, + const psiconv_encoding encoding_type); typedef struct psiconv_fileformat_s { const char *name;