--- psiconv/trunk/lib/psiconv/data.h	2000/12/10 02:17:45	55
+++ psiconv/trunk/lib/psiconv/data.h	2000/12/10 15:44:40	56
@@ -95,27 +95,27 @@
 /* Colors.
    black: 0x00 0x00 0x00 
    white: 0xff 0xff 0xff */
-typedef struct psiconv_color
+typedef struct psiconv_color_s
 {
   psiconv_u8 red;
   psiconv_u8 green;
   psiconv_u8 blue;
 } * psiconv_color;
 
-typedef struct psiconv_font
+typedef struct psiconv_font_s
 {
   char *name;
   psiconv_u8 screenfont;
 } *psiconv_font;
 
-typedef struct psiconv_border
+typedef struct psiconv_border_s
 { 
   psiconv_border_kind_t kind;
   psiconv_size_t thickness; /* Set to 1/20 for non-solid lines */
   psiconv_color color;
 } *psiconv_border;
 
-typedef struct psiconv_bullet
+typedef struct psiconv_bullet_s
 {
   psiconv_bool_t on;
   psiconv_size_t font_size;
@@ -132,7 +132,7 @@
   psiconv_tab_right
 } psiconv_tab_kind_t;
 
-typedef struct psiconv_tab
+typedef struct psiconv_tab_s
 {
   psiconv_length_t location;
   psiconv_tab_kind_t kind;
@@ -141,13 +141,13 @@
 
 typedef psiconv_list psiconv_tab_list; /* of struct psiconv_tab */
 
-typedef struct psiconv_all_tabs
+typedef struct psiconv_all_tabs_s
 {
   psiconv_length_t normal;
   psiconv_tab_list extras;
 } *psiconv_all_tabs;
 
-typedef struct psiconv_character_layout
+typedef struct psiconv_character_layout_s
 {
   psiconv_color color;
   psiconv_color back_color;
@@ -160,7 +160,7 @@
   psiconv_font font; 
 } *psiconv_character_layout;
 
-typedef struct psiconv_paragraph_layout
+typedef struct psiconv_paragraph_layout_s
 {
   psiconv_color back_color;
   psiconv_length_t indent_left;
@@ -185,7 +185,7 @@
   psiconv_all_tabs tabs;
 } *psiconv_paragraph_layout;
 
-typedef struct psiconv_header_section
+typedef struct psiconv_header_section_s
 {
   psiconv_u32 uid1;
   psiconv_u32 uid2;
@@ -194,7 +194,7 @@
   psiconv_file_type_t file;
 } *psiconv_header_section;
 
-typedef struct psiconv_section_table_entry
+typedef struct psiconv_section_table_entry_s
 {
   psiconv_u32 id;
   psiconv_u32 offset;
@@ -203,13 +203,13 @@
 typedef psiconv_list psiconv_section_table_section; 
 /* Of struct sectiontable_entry */
 
-typedef struct psiconv_application_id_section
+typedef struct psiconv_application_id_section_s
 {
   psiconv_u32 id;
   psiconv_string_t name;
 } *psiconv_application_id_section;
 
-typedef struct psiconv_in_line_layout
+typedef struct psiconv_in_line_layout_s
 {
   psiconv_character_layout layout;
   int length;
@@ -226,7 +226,7 @@
   psiconv_replace_filename
 } psiconv_replacement_type_t;
 
-typedef struct psiconv_replacement
+typedef struct psiconv_replacement_s
 {
   int offset;
   int cur_len;
@@ -235,7 +235,7 @@
 
 typedef psiconv_list psiconv_replacements; /* of struct replacement */
 
-typedef struct psiconv_paragraph
+typedef struct psiconv_paragraph_s
 {
   char *text;
   psiconv_character_layout base_character;
@@ -247,12 +247,12 @@
 
 typedef psiconv_list psiconv_text_and_layout; /* Of struct paragraphs */
 
-typedef struct psiconv_texted_section
+typedef struct psiconv_texted_section_s
 {
   psiconv_text_and_layout paragraphs; 
 } *psiconv_texted_section;
 
-typedef struct psiconv_page_header
+typedef struct psiconv_page_header_s
 {
   psiconv_bool_t on_first_page;
   psiconv_paragraph_layout base_paragraph_layout;
@@ -260,7 +260,7 @@
   psiconv_texted_section text; 
 } *psiconv_page_header;
 
-typedef struct psiconv_page_layout_section
+typedef struct psiconv_page_layout_section_s
 {
   psiconv_u32 first_page_nr;
   psiconv_length_t header_dist;
@@ -275,7 +275,7 @@
   psiconv_page_header footer;
 } * psiconv_page_layout_section;
 
-typedef struct psiconv_word_status_section
+typedef struct psiconv_word_status_section_s
 {
   psiconv_bool_t show_tabs;
   psiconv_bool_t show_spaces;
@@ -292,7 +292,7 @@
   psiconv_u32 display_size;
 } *psiconv_word_status_section;
 
-typedef struct psiconv_word_style
+typedef struct psiconv_word_style_s
 {
   psiconv_character_layout character;
   psiconv_paragraph_layout paragraph;
@@ -304,20 +304,22 @@
 
 typedef psiconv_list psiconv_word_style_list; /* Of style */
 
-typedef struct psiconv_word_styles_section
+typedef struct psiconv_word_styles_section_s
 {
   psiconv_word_style normal;
   psiconv_word_style_list styles;
 } *psiconv_word_styles_section;
 
-typedef struct psiconv_word_f {
+typedef struct psiconv_word_f_s
+{
   psiconv_page_layout_section page_sec;
   psiconv_text_and_layout paragraphs;
   psiconv_word_status_section status_sec;
   psiconv_word_styles_section styles_sec;
 } *psiconv_word_f;
 
-typedef struct psiconv_texted_f {
+typedef struct psiconv_texted_f_s
+{
   psiconv_page_layout_section page_sec;
   psiconv_texted_section texted_sec;
 } *psiconv_texted_f;
@@ -326,7 +328,8 @@
 
 /* Normalized values [0..1] for each component 
    Origin is (x,y)=(0,0), to get pixel at (X,Y) use index [Y*xsize+X] */
-typedef struct psiconv_paint_data_section {
+typedef struct psiconv_paint_data_section_s
+{
   psiconv_u32 xsize;
   psiconv_u32 ysize;
   psiconv_length_t pic_xsize; /* 0 if not specified */
@@ -339,7 +342,8 @@
 typedef psiconv_list psiconv_pictures; 
             /* of struct psiconv_paint_data_section */
 
-typedef struct psiconv_mbm_f {
+typedef struct psiconv_mbm_f_s 
+{
   psiconv_pictures sections;
 } *psiconv_mbm_f;
 
@@ -349,7 +353,8 @@
    picture itself has size picture_{x,y}size. 
    Cuts are always <= 1.0; a cut of 0.0 cuts nothing away, a cut of 1.0
    cuts everything away. */
-typedef struct psiconv_sketch_section {
+typedef struct psiconv_sketch_section_s
+{
   psiconv_u16 form_xsize; 
   psiconv_u16 form_ysize;
   psiconv_u16 picture_x_offset;
@@ -365,22 +370,26 @@
   psiconv_paint_data_section picture;
 } *psiconv_sketch_section;
 
-typedef struct psiconv_sketch_f {
+typedef struct psiconv_sketch_f_s 
+{
   psiconv_sketch_section sketch_sec;
 } *psiconv_sketch_f;
 
-typedef struct psiconv_clipart_section {
+typedef struct psiconv_clipart_section_s 
+{
   /* Perhaps later on some currently unknown stuff. */
   psiconv_paint_data_section picture;
 } * psiconv_clipart_section;
 
 typedef psiconv_list psiconv_cliparts; /* of struct psiconv_clipart_section */
 
-typedef struct psiconv_clipart_f {
+typedef struct psiconv_clipart_f_s 
+{
   psiconv_cliparts sections;
 } *psiconv_clipart_f;
 
-typedef struct psiconv_file {
+typedef struct psiconv_file_s 
+{
   psiconv_file_type_t type;
   void *file;
 } *psiconv_file;