[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.76 and 1.79

version 1.76, 2009/03/16 16:43:03 version 1.79, 2009/06/01 07:31:54
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.75 2009/02/05 08:37:02 ohara Exp $   * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.78 2009/03/27 14:42:29 ohara Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 57 
Line 57 
   
 #if !defined(VISUAL)  #if !defined(VISUAL)
 #include <unistd.h>  #include <unistd.h>
 #endif  
   
 #if !defined(VISUAL)  
 #include <sys/param.h>  #include <sys/param.h>
 #endif  #endif
   
Line 153  typedef enum {
Line 150  typedef enum {
         A_end=0,A_fnode,A_arf,A_int,A_str,A_internal,A_node,A_notimpl,A_func          A_end=0,A_fnode,A_arf,A_int,A_str,A_internal,A_node,A_notimpl,A_func
 } farg_type;  } farg_type;
   
 #if SIZEOF_LONG == 4  #if SIZEOF_LONG == 8
 #if defined(VISUAL)  typedef long L;
 typedef _int64 L;  typedef unsigned long UL;
 typedef unsigned _int64 UL;  #elif defined(HAVE_UNSIGNED_LONG_LONG)
 #else  
 typedef long long L;  typedef long long L;
 typedef unsigned long long UL;  typedef unsigned long long UL;
   #elif defined(_MSC_VER)
   typedef _int64 L;
   typedef unsigned _int64 UL;
 #endif  #endif
 #else  
 typedef long L;  
 typedef unsigned long UL;  
 #endif  
   
 typedef struct oN {  typedef struct oN {
         int p;          int p;
Line 626  struct order_spec {
Line 621  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 2645  void addnbp(VL vl,NBP p1,NBP p2, NBP *rp);
Line 2641  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.76  
changed lines
  Added in v.1.79
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>