===================================================================
RCS file: /home/cvs/OpenXM_contrib/pari-2.2/src/headers/Attic/paristio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- OpenXM_contrib/pari-2.2/src/headers/Attic/paristio.h	2001/10/02 11:17:07	1.1
+++ OpenXM_contrib/pari-2.2/src/headers/Attic/paristio.h	2002/09/11 07:26:58	1.2
@@ -1,4 +1,4 @@
-/* $Id: paristio.h,v 1.1 2001/10/02 11:17:07 noro Exp $
+/* $Id: paristio.h,v 1.2 2002/09/11 07:26:58 noro Exp $
 
 Copyright (C) 2000  The PARI group.
 
@@ -15,11 +15,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 
 /* This file contains memory and I/O management definitions       */
 
+typedef struct {
+  long s, us;
+} pari_timer;
+
 typedef unsigned char *byteptr;
+typedef ulong gpmem_t;
 
 typedef struct stackzone
 {
-  long zonetop, bot, top, avma, memused;
+  gpmem_t zonetop, bot, top, avma;
+  size_t memused;
 } stackzone;
 
 typedef struct entree {
@@ -53,26 +59,27 @@ typedef struct pariFILE {
 extern PariOUT *pariOut, *pariErr;
 extern FILE    *pari_outfile, *logfile, *infile, *errfile;
 
-extern ulong avma,bot,top,memused;
+extern gpmem_t avma,bot,top;
+extern size_t memused;
 extern byteptr diffptr;
 extern entree  **varentries;
 extern char    *errmessage[], *current_psfile;
 
 #define is_universal_constant(x) ((GEN)(x) >= gzero && (GEN)(x) <= gi)
 
-#define copyifstack(x,y) {ulong t=(ulong)(x); \
-			  (y)=(t>=bot &&t<top)? lcopy((GEN)t): t;}
-#define icopyifstack(x,y) {ulong t=(ulong)(x); \
-			  (y)=(t>=bot &&t<top)? licopy((GEN)t): t;}
-#define isonstack(x) ((ulong)(x)>=bot && (ulong)(x)<top)
+#define copyifstack(x,y)  STMT_START {gpmem_t _t=(gpmem_t)(x); \
+  (y)=(_t>=bot &&_t<top)? lcopy((GEN)_t): (long)_t;} STMT_END
+#define icopyifstack(x,y) STMT_START {gpmem_t _t=(gpmem_t)(x); \
+  (y)=(_t>=bot &&_t<top)? licopy((GEN)_t): (long)_t;} STMT_END
+#define isonstack(x) ((gpmem_t)(x)>=bot && (gpmem_t)(x)<top)
 
 /* Define this to (1) locally (in a given file, NOT here) to check
  * "random" garbage collecting
  */
 #ifdef DYNAMIC_STACK
-#  define low_stack(x,l) (avma < (ulong)(l))
+#  define low_stack(x,l) (avma < (gpmem_t)(l))
 #else
-#  define low_stack(x,l) (avma < (ulong)(x))
+#  define low_stack(x,l) (avma < (gpmem_t)(x))
 #endif
 
 #define stack_lim(av,n) (bot + (((av)-bot)>>(n)))