--- psiconv/trunk/program/psiconv/gen_rtf.c	2000/10/21 00:49:13	53
+++ psiconv/trunk/program/psiconv/gen_rtf.c	2000/12/10 15:44:40	56
@@ -327,11 +327,11 @@
 static psiconv_character_layout 
        gen_base_char(psiconv_list colors, psiconv_list fonts)
 {
-  struct psiconv_color white = { 0,0,0 };
-  struct psiconv_color black = { 0xff,0xff,0xff };
-  struct psiconv_font font = { NULL,-1 }; /* Pseudo - not added! */
+  struct psiconv_color_s white = { 0,0,0 };
+  struct psiconv_color_s black = { 0xff,0xff,0xff };
+  struct psiconv_font_s font = { NULL,-1 }; /* Pseudo - not added! */
   
-  struct psiconv_character_layout base_char_struct =
+  struct psiconv_character_layout_s base_char_struct =
   {
     &black,                /* color               */
     &white,                /* back_color          */
@@ -540,7 +540,7 @@
   return fclose(of);
 }
 
-static struct psiconv_fileformat ff =
+static struct psiconv_fileformat_s ff =
 {
   "RTF",
   "Rich Text Format (not functional yet!)",