--- psiconv/trunk/lib/psiconv/parse_routines.h	1999/12/04 00:40:10	43
+++ psiconv/trunk/lib/psiconv/parse_routines.h	2000/12/13 16:17:54	62
@@ -20,24 +20,20 @@
 #ifndef PSICONV_PARSE_ROUTINES_H
 #define PSICONV_PARSE_ROUTINES_H
 
-#include "data.h"
-#include "parse.h"
+#include <psiconv/parse.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 
 /* ***************
-   * parse_aux.c *
+   * misc.c *
    *************** */
 
-/* These functions print error, warning, progress and debug information to
-   stderr */
-extern void psiconv_fatal(int level, psiconv_u32 off, const char *format,...);
-extern void psiconv_warn(int level, psiconv_u32 off, const char *format,...);
-extern void psiconv_progress(int level, psiconv_u32 off, 
-                             const char *format,...);
-extern void psiconv_debug(int level, psiconv_u32 off, const char *format,...);
-
 /* This function returns a copy of a string, that contains no ASCII codes
    that are not printable. You should free this string yourself when you are
-   done with it. */
+   done with it. Returns NULL if there is not enough memory left. */
 extern char *psiconv_make_printable(const char *s);
 
 /* **************
@@ -182,7 +178,8 @@
    ***************** */
 
 extern int psiconv_parse_paint_data_section(const psiconv_buffer buf,int lev,
-                                     psiconv_u32 off, int *length,
+                                     psiconv_u32 off, int *length, 
+                                     int isclipart,
                                      psiconv_paint_data_section *result);
 
 extern int psiconv_parse_jumptable_section(const psiconv_buffer buf,int lev,
@@ -217,5 +214,8 @@
 
 extern int psiconv_parse_clipart_file(const psiconv_buffer buf,int lev, 
                                    psiconv_u32 off, psiconv_clipart_f *result);
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* PSICONV_PARSE_ROUTINES_H */