[Cpri-develop] cpri/src dialpri.c,1.4,1.5 spooler.c,1.6,1.7

[<ch...@pr...>]

Update of /cvsroot/cpri/cpri/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2313/src

Modified Files:
	dialpri.c spooler.c 
Log Message:
Fixed bug 888505	Doesn't build on Linux.
Clearified some stuff in the readme.
Removed misc/makedoc. There is already dependencies to cgui so cgui's makedoc can preferably be used (CGUIDIR is required for cpri and has so been all the time)
Cleaned some other junk from makefiles.
Corrected some syntactical matters in docs to avoid warnings from makedoc.


Index: dialpri.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/dialpri.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dialpri.c	25 Mar 2003 07:23:42 -0000	1.4
--- dialpri.c	1 Feb 2004 17:09:16 -0000	1.5
***************
*** 118,123 ****
  #ifdef ALLEGRO_DOS
        prilang_sel[i] = ptxt[pt_pribrands + i];
  #else
!    prilang_sel[i] = "Windows";
  #endif
     dialpri->id3 = AddButton(DOWNLEFT | ALIGNRIGHT, ptxt[pt_print_test], PrintTest, dialpri);
--- 118,125 ----
  #ifdef ALLEGRO_DOS
        prilang_sel[i] = ptxt[pt_pribrands + i];
+ #elseif define ALLEGRO_WINDOWS
+       prilang_sel[i] = "Windows";
  #else
!       prilang_sel[i] = "Linux";
  #endif
     dialpri->id3 = AddButton(DOWNLEFT | ALIGNRIGHT, ptxt[pt_print_test], PrintTest, dialpri);

Index: spooler.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/spooler.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** spooler.c	28 Mar 2003 23:13:48 -0000	1.6
--- spooler.c	1 Feb 2004 17:09:16 -0000	1.7
***************
*** 705,709 ****
     }
  }
!       
  static struct t_driver *DefaultInit(struct t_printerq *data nouse) {return NULL;}
  static void DefaultClose(struct t_driver *data nouse) {}
--- 705,709 ----
     }
  }
! 
  static struct t_driver *DefaultInit(struct t_printerq *data nouse) {return NULL;}
  static void DefaultClose(struct t_driver *data nouse) {}
***************
*** 721,725 ****
        q->vtable = _cpri_text_vtable;
        break;
! #ifdef DJGPP
     case QUEUE_OPTIMALPORT:
        q->vtable = &default_vtable;
--- 721,725 ----
        q->vtable = _cpri_text_vtable;
        break;
! #ifdef ALLEGRO_DOS
     case QUEUE_OPTIMALPORT:
        q->vtable = &default_vtable;
***************
*** 748,754 ****
           break;
        }
! #else
     default:
        q->vtable = _cpri_stdwin_vtable;
  #endif
        break;
--- 748,757 ----
           break;
        }
! #elseif ALLEGRO_WINDOWS
     default:
        q->vtable = _cpri_stdwin_vtable;
+ #else
+    default:
+       q->vtable = _cpri_html_vtable;
  #endif
        break;