--- psiconv/trunk/lib/psiconv/parse_driver.c	2000/12/15 00:21:51	64
+++ psiconv/trunk/lib/psiconv/parse_driver.c	2000/12/22 22:31:50	71
@@ -18,11 +18,12 @@
 */
 
 #include "config.h"
+#include "compat.h"
+
 #include <stdlib.h>
 
 #include "parse.h"
 #include "parse_routines.h"
-#include "data.h"
 
 psiconv_file_type_t psiconv_file_type(psiconv_buffer buf,int *length,
                                       psiconv_header_section *result)
@@ -114,9 +115,9 @@
     if (!(entry = psiconv_list_get(table,i)))
       goto ERROR4;
     psiconv_progress(lev+3,off,"Going to read clipart section %i",i);
-    if (!(psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart)))
+    if ((res = psiconv_parse_clipart_section(buf,lev+3,*entry,NULL,&clipart)))
       goto ERROR4;
-    if (!(psiconv_list_add((*result)->sections,clipart)))
+    if ((res = psiconv_list_add((*result)->sections,clipart)))
       goto ERROR5;
   }
 
@@ -646,7 +647,7 @@
   psiconv_free_section_table_section(table);
 
   psiconv_progress(lev+1,off,"End of word file");
-  return res;
+  return 0;
 
 
 ERROR8: