--- psiconv/trunk/lib/psiconv/data.h	1999/12/03 00:59:12	41
+++ psiconv/trunk/lib/psiconv/data.h	2000/12/10 02:17:45	55
@@ -30,6 +30,11 @@
 /* All types which end on _t are plain types; all other types are pointers
    to structs */
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
 typedef enum psiconv_file_type {
   psiconv_unknown_file,
   psiconv_word_file,
@@ -317,7 +322,7 @@
   psiconv_texted_section texted_sec;
 } *psiconv_texted_f;
 
-typedef psiconv_list psiconv_mbm_jumptable_section; /* of psiconv_u32 */
+typedef psiconv_list psiconv_jumptable_section; /* of psiconv_u32 */
 
 /* Normalized values [0..1] for each component 
    Origin is (x,y)=(0,0), to get pixel at (X,Y) use index [Y*xsize+X] */
@@ -411,6 +416,7 @@
 #define PSICONV_ID_TEXTED_TEXT 0x10000064
 #define PSICONV_ID_STYLE_REMOVABLE 0x1000004F
 #define PSICONV_ID_STYLE_BUILT_IN 0x1000004C
+#define PSICONV_ID_CLIPART_ITEM 0x10000040
 
 
 /* Return a clean layout_status. You can modify it at will */
@@ -463,8 +469,8 @@
 extern void psiconv_free_texted_f(psiconv_texted_f file);
 extern void psiconv_free_paint_data_section(psiconv_paint_data_section section);
 extern void psiconv_free_pictures(psiconv_pictures section);
-extern void psiconv_free_mbm_jumptable_section
-                                       (psiconv_mbm_jumptable_section section);
+extern void psiconv_free_jumptable_section
+                                       (psiconv_jumptable_section section);
 extern void psiconv_free_mbm_f(psiconv_mbm_f file);
 extern void psiconv_free_sketch_section(psiconv_sketch_section sec);
 extern void psiconv_free_sketch_f(psiconv_sketch_f file);
@@ -475,5 +481,8 @@
 
 extern void psiconv_free_file(psiconv_file file);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* def PSICONV_DATA_H */