===================================================================
RCS file: /home/cvs/OpenXM_contrib/pari-2.2/src/graph/Attic/rect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- OpenXM_contrib/pari-2.2/src/graph/Attic/rect.h	2001/10/02 11:17:07	1.1
+++ OpenXM_contrib/pari-2.2/src/graph/Attic/rect.h	2002/09/11 07:26:57	1.2
@@ -1,4 +1,4 @@
-/* $Id: rect.h,v 1.1 2001/10/02 11:17:07 noro Exp $
+/* $Id: rect.h,v 1.2 2002/09/11 07:26:57 noro Exp $
 
 Copyright (C) 2000  The PARI group.
 
@@ -30,13 +30,17 @@ typedef struct PARI_plot {
 } PARI_plot;
 
 extern PARI_plot pari_plot, pari_psplot;
+#ifdef BOTH_GNUPLOT_AND_X11
+extern PARI_plot pari_X11plot;
+#endif
+extern PARI_plot *pari_plot_engine;
 
-#define w_height (pari_plot.height)
-#define w_width (pari_plot.width)
-#define f_height (pari_plot.fheight)
-#define f_width (pari_plot.fwidth)
-#define h_unit (pari_plot.hunit)
-#define v_unit (pari_plot.vunit)
+#define w_height (pari_plot_engine->height)
+#define w_width (pari_plot_engine->width)
+#define f_height (pari_plot_engine->fheight)
+#define f_width (pari_plot_engine->fwidth)
+#define h_unit (pari_plot_engine->hunit)
+#define v_unit (pari_plot_engine->vunit)
 #define lmargin (f_width*10)
 #define rmargin (h_unit - 1)
 #define tmargin (v_unit - 1)
@@ -255,7 +259,7 @@ extern  GEN     ploth(entree *ep, GEN a, GEN b, char *
 extern  GEN     ploth2(entree *ep, GEN a, GEN b, char *ch, long prec);
 extern  GEN     plothmult(entree *ep, GEN a, GEN b, char *ch, long prec);
 extern  GEN     plothraw(GEN listx, GEN listy, long flag);
-extern  GEN     plothsizes();
+extern  GEN     plothsizes(void);
 extern  GEN     plothsizes_flag(long flag);
 extern  void    postdraw(GEN list);
 extern  void    postdraw_flag(GEN list, long flag);