[BACK]Return to ca.h CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / include

Diff for /OpenXM_contrib2/asir2000/include/ca.h between version 1.77 and 1.84

version 1.77, 2009/03/16 16:56:35 version 1.84, 2013/07/31 00:38:12
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *   *
  * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.76 2009/03/16 16:43:03 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.83 2013/06/13 18:03:14 ohara Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 69 
Line 69 
 #endif  #endif
   
 #if defined(VISUAL)  #if defined(VISUAL)
   #include <limits.h>
 #include <malloc.h>  #include <malloc.h>
 #endif  #endif
   
Line 90  typedef void * pointer;
Line 91  typedef void * pointer;
 #endif  #endif
 #endif  #endif
   
   #define NULLP ((void *)0)
   
 #define TODO            printf("%s: not implemented!\n", __func__)  #define TODO            printf("%s: not implemented!\n", __func__)
   
 #define COPY(a,b) ((b)=(a))  #define COPY(a,b) ((b)=(a))
Line 621  struct order_spec {
Line 624  struct order_spec {
         Obj obj;          Obj obj;
         int nv;          int nv;
         int ispot; /* 1 means Position over Term (Pos then Term) */          int ispot; /* 1 means Position over Term (Pos then Term) */
           int pot_nelim; /* size of positions for pot-elimination order */
         union {          union {
                 int simple;                  int simple;
                 struct {                  struct {
Line 723  typedef unsigned int ModNum;
Line 727  typedef unsigned int ModNum;
   
 /* memory allocators (W_... : uses alloca) */  /* memory allocators (W_... : uses alloca) */
   
 #if 0  
 #define MALLOC(d) Risa_GC_malloc(d)  #define MALLOC(d) Risa_GC_malloc(d)
 #define MALLOC_ATOMIC(d) Risa_GC_malloc_atomic(d)  #define MALLOC_ATOMIC(d) Risa_GC_malloc_atomic(d)
   #define MALLOC_ATOMIC_IGNORE_OFF_PAGE(d) Risa_GC_malloc_atomic_ignore_off_page(d)
 #define REALLOC(p,d) Risa_GC_realloc(p,d)  #define REALLOC(p,d) Risa_GC_realloc(p,d)
 #else  #define GCFREE(p) Risa_GC_free(p)
 #define MALLOC(d) GC_malloc(d)  
 #define MALLOC_ATOMIC(d) GC_malloc_atomic(d)  
 #define REALLOC(p,d) GC_realloc(p,d)  
 #endif  
 #define CALLOC(d,e) MALLOC((d)*(e))  #define CALLOC(d,e) MALLOC((d)*(e))
   
 #if !defined(__CYGWIN__) && (defined(__GNUC__) || defined(vax) || defined(apollo) || defined(alloca) || defined(VISUAL))  #if !defined(__CYGWIN__) && (defined(__GNUC__) || defined(vax) || defined(apollo) || defined(alloca) || defined(VISUAL))
Line 1317  void copyn(N,int,int *);
Line 1317  void copyn(N,int,int *);
 void kmulnmain(N,N,N *);  void kmulnmain(N,N,N *);
 int qcoefp(Obj);  int qcoefp(Obj);
 int qcoefr(Obj);  int qcoefr(Obj);
 long get_allocwords(void);  size_t get_allocwords(void);
 double get_clock(void);  double get_clock(void);
 void get_eg(struct oEGT *);  void get_eg(struct oEGT *);
 void printtime(struct oEGT *,struct oEGT *,double);  void printtime(struct oEGT *,struct oEGT *,double);
Line 1427  void Risa_GC_get_adj(int *,int *);
Line 1427  void Risa_GC_get_adj(int *,int *);
 void *Risa_GC_malloc(size_t);  void *Risa_GC_malloc(size_t);
 void *Risa_GC_malloc_atomic(size_t);  void *Risa_GC_malloc_atomic(size_t);
 void *Risa_GC_realloc(void *,size_t);  void *Risa_GC_realloc(void *,size_t);
   void Risa_GC_free(void *);
   void *Risa_GC_malloc_atomic_ignore_off_page(size_t);
 void *GC_malloc(size_t);  void *GC_malloc(size_t);
 void *GC_malloc_atomic(size_t);  void *GC_malloc_atomic(size_t);
 void *GC_realloc(void *,size_t);  void *GC_realloc(void *,size_t);
Line 2640  void addnbp(VL vl,NBP p1,NBP p2, NBP *rp);
Line 2642  void addnbp(VL vl,NBP p1,NBP p2, NBP *rp);
 void mulnbp(VL vl,NBP p1,NBP p2, NBP *rp);  void mulnbp(VL vl,NBP p1,NBP p2, NBP *rp);
 void pwrnbp(VL vl,NBP p1,Q n, NBP *rp);  void pwrnbp(VL vl,NBP p1,Q n, NBP *rp);
 int compnbp(VL vl,NBP p1,NBP p2);  int compnbp(VL vl,NBP p1,NBP p2);
   
 #if defined(PARI23)  
 #define prec precreal  
 #define mppgcd(a,b)  (gcdii((a),(b)))  
 #endif  
Legend:
Removed from v.1.77  
changed lines
  Added in v.1.84
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>