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

Diff for /OpenXM_contrib2/asir2018/include/ca.h between version 1.12 and 1.17

version 1.12, 2019/11/12 07:47:45 version 1.17, 2019/12/27 08:13:59
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/asir2018/include/ca.h,v 1.11 2019/09/19 06:29:48 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.16 2019/12/19 08:34:42 fujimoto Exp $
 */  */
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
Line 95  typedef caddr_t pointer;
Line 95  typedef caddr_t pointer;
   
 typedef void * pointer;  typedef void * pointer;
   
 #if defined(sun)  #if defined(ANDROID)
 #include <strings.h>  #include <strings.h>
   #include <string.h>
   #define index(s,c) strchr(s,c)
   #define rindex(s,c) strrchr(s,c)
   #elif defined(sun)
   #include <strings.h>
 #else  #else
 #include <string.h>  #include <string.h>
 #if defined(VISUAL) || defined(__MINGW32__)  #if defined(VISUAL) || defined(__MINGW32__)
Line 538  typedef struct oDMM {
Line 543  typedef struct oDMM {
 typedef struct oDMMstack {  typedef struct oDMMstack {
   int rank,ordtype;    int rank,ordtype;
   DMM *in;    DMM *in;
     DMM *sum;
   LIST obj;    LIST obj;
   struct oDMMstack *next;    struct oDMMstack *next;
 } *DMMstack;  } *DMMstack;
   
   typedef struct oDMMstack_array {
     int len;
     DMMstack *body;
   } *DMMstack_array;
   
 typedef struct oDL {  typedef struct oDL {
   int td;    int td;
   int d[1];    int d[1];
Line 689  struct order_spec {
Line 700  struct order_spec {
   int *top_weight;    int *top_weight;
   int module_rank;    int module_rank;
   int *module_top_weight;    int *module_top_weight;
     int *module_base_ord;
   struct order_spec *base; /* for schreyer order */    struct order_spec *base; /* for schreyer order */
   DMMstack dmmstack;    DMMstack dmmstack;
   union {    union {
Line 818  void (*set_signal(int sig, void (*handler)(int)))(int)
Line 830  void (*set_signal(int sig, void (*handler)(int)))(int)
 #endif  #endif
   
 /* for setjmp/longjmp compatibility */  /* for setjmp/longjmp compatibility */
 #if defined(__CYGWIN__) || defined(HAVE_SIGACTION) || (defined(__x86_64) && !defined(__MINGW32__))  #if defined(ANDROID)
   #define JMP_BUF jmp_buf
   #define SETJMP(x) _setjmp(x)
   #define LONGJMP(x,y) _longjmp(x,y)
   #elif defined(__CYGWIN__) || defined(HAVE_SIGACTION) || (defined(__x86_64) && !defined(__MINGW32__))
 #define JMP_BUF sigjmp_buf  #define JMP_BUF sigjmp_buf
 #define SETJMP(x) sigsetjmp(x,~0)  #define SETJMP(x) sigsetjmp(x,~0)
 #define LONGJMP(x,y) siglongjmp(x,y)  #define LONGJMP(x,y) siglongjmp(x,y)
Line 911  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
Line 927  bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWMP(m) ((m)=(MP)MALLOC(sizeof(struct oMP)))  #define NEWMP(m) ((m)=(MP)MALLOC(sizeof(struct oMP)))
 #define NEWDMM(m) ((m)=(DMM)MALLOC(sizeof(struct oDMM)))  #define NEWDMM(m) ((m)=(DMM)MALLOC(sizeof(struct oDMM)))
 #define NEWDMMstack(m) ((m)=(DMMstack)MALLOC(sizeof(struct oDMMstack)))  #define NEWDMMstack(m) ((m)=(DMMstack)MALLOC(sizeof(struct oDMMstack)))
   #define NEWDMMstack_array(m) ((m)=(DMMstack_array)MALLOC(sizeof(struct oDMMstack_array)))
 #define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET)))  #define NEWDLBUCKET(a) ((a)=(DLBUCKET)MALLOC(sizeof(struct oDLBUCKET)))
 #define NEWDPP(a) ((a)=(DP_pairs)MALLOC(sizeof(struct dp_pairs)))  #define NEWDPP(a) ((a)=(DP_pairs)MALLOC(sizeof(struct dp_pairs)))
   
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>