--- psiconv/trunk/lib/psiconv/parse_common.c 2000/12/10 02:17:45 55 +++ psiconv/trunk/lib/psiconv/parse_common.c 2000/12/10 15:44:40 56 @@ -260,8 +260,8 @@ /* Initialize the remaining parts of each paragraph */ for (i = 0; i < psiconv_list_length(*result); i ++) { para = psiconv_list_get(*result,i); - para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout)); - para->replacements = psiconv_list_new(sizeof(struct psiconv_replacement)); + para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout_s)); + para->replacements = psiconv_list_new(sizeof(struct psiconv_replacement_s)); para->base_style = 0; para->base_character = psiconv_basic_character_layout(); para->base_paragraph = psiconv_basic_paragraph_layout(); @@ -292,7 +292,7 @@ psiconv_u32 temp; int parse_styles,nr,i,j,total,leng,line_length; - typedef struct anon_style + typedef struct anon_style_s { int nr; psiconv_s16 base_style; @@ -303,11 +303,11 @@ typedef psiconv_list anon_style_list; /* of struct anon_style */ anon_style_list anon_styles; - struct anon_style anon; + struct anon_style_s anon; anon_style anon_ptr=NULL; psiconv_paragraph para; - struct psiconv_in_line_layout in_line; + struct psiconv_in_line_layout_s in_line; int *inline_count; @@ -398,7 +398,7 @@ if (i >= psiconv_list_length(result)) { psiconv_debug(lev+4,off+len,"Going to allocate a new element"); para = malloc(sizeof(*para)); - para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout)); + para->in_lines = psiconv_list_new(sizeof(struct psiconv_in_line_layout_s)); para->base_style = 0; para->base_character = psiconv_basic_character_layout(); para->base_paragraph = psiconv_basic_paragraph_layout(); @@ -588,7 +588,7 @@ styles_section->normal->paragraph = psiconv_clone_paragraph_layout(base_para); styles_section->normal->hotkey = 0; styles_section->normal->name = strdup(""); - styles_section->styles = psiconv_list_new(sizeof(struct psiconv_word_style)); + styles_section->styles = psiconv_list_new(sizeof(struct psiconv_word_style_s)); res = psiconv_parse_layout_section(buf,lev,off,length,result, styles_section,0);