--- psiconv/trunk/program/psiconv/psiconv.c	2000/10/21 00:49:13	53
+++ psiconv/trunk/program/psiconv/psiconv.c	2000/12/13 00:42:04	61
@@ -36,8 +36,8 @@
 #include <magick/magick.h>
 #endif
 
-#include "data.h"
-#include "parse.h"
+#include "psiconv/data.h"
+#include "psiconv/parse.h"
 #include "gen.h"
 #include "psiconv.h"
 
@@ -115,7 +115,7 @@
   psiconv_file file;
   psiconv_fileformat ff;
 
-  fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat));
+  fileformat_list = psiconv_list_new(sizeof(struct psiconv_fileformat_s));
   init_txt();
   init_html();
   init_html4();
@@ -133,7 +133,7 @@
                   psiconv_verbosity = PSICONV_VERB_PROGRESS; 
                 break;
       case 'd': psiconv_verbosity = PSICONV_VERB_DEBUG; break;
-      case 's': psiconv_verbosity = PSICONV_VERB_SILENT; break;
+      case 's': psiconv_verbosity = PSICONV_VERB_FATAL; break;
       case 'e': exact = 1; break;
       case 'o': outputfilename = strdup(optarg); break;
       case 'T': type = strdup(optarg); break;