===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/parif.c,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- OpenXM_contrib2/asir2000/builtin/parif.c	2002/07/12 08:05:23	1.11
+++ OpenXM_contrib2/asir2000/builtin/parif.c	2009/03/16 16:43:02	1.15
@@ -45,12 +45,12 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.10 2001/10/09 01:36:06 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/parif.c,v 1.14 2003/02/14 22:29:07 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
-#if PARI
+#if defined(PARI)
 #include "genpari.h"
 
 extern long prec;
@@ -96,14 +96,11 @@ void f(ar,rp) NODE ar; Obj *rp;\
 
 #if defined(INTERVAL)
 #define	PREC_CONV	pariK1
-#else
-#if defined(LONG_IS_32BIT)
+#elif SIZEOF_LONG == 4
 #define PREC_CONV		0.103810253
-#endif
-#if defined(LONG_IS_64BIT)
+#elif SIZEOF_LONG == 8
 #define PREC_CONV		0.051905126
 #endif
-#endif
 
 /* XXX : we should be more careful when we free PARI pointers. */
 
@@ -386,7 +383,7 @@ struct pariftab pariftab[] = {
 {"indsort",indexsort,1},
 {"initalg",initalg,1},
 {"isfund",gisfundamental,1},
-{"isprime",gisprime,1},
+{"isprime",gisprime,2},
 {"ispsp",gispsp,1},
 {"isqrt",racine,1},
 {"issqfree",gissquarefree,1},
@@ -397,16 +394,13 @@ struct pariftab pariftab[] = {
 {"keri",keri,1},
 {"kerint",kerint,1},
 {"kerintg1",kerint1,1},
-{"kerint2",kerint2,1},
 {"length",(GEN(*)())glength,1},
 {"lexsort",lexsort,1},
 {"lift",lift,1},
 {"lindep",lindep,1},
 {"lll",lll,1},
-{"lllg1",lll1,1},
 {"lllgen",lllgen,1},
 {"lllgram",lllgram,1},
-{"lllgramg1",lllgram1,1},
 {"lllgramgen",lllgramgen,1},
 {"lllgramint",lllgramint,1},
 {"lllgramkerim",lllgramkerim,1},
@@ -414,7 +408,6 @@ struct pariftab pariftab[] = {
 {"lllint",lllint,1},
 {"lllkerim",lllkerim,1},
 {"lllkerimgen",lllkerimgen,1},
-{"lllrat",lllrat,1},
 {"lngamma",glngamma,1},
 {"logagm",glogagm,1},
 {"mat",gtomat,1},