===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.h,v
retrieving revision 1.32
retrieving revision 1.36
diff -u -p -r1.32 -r1.36
--- OpenXM_contrib2/asir2000/engine/nd.h	2015/08/06 10:01:52	1.32
+++ OpenXM_contrib2/asir2000/engine/nd.h	2017/02/21 09:20:23	1.36
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.31 2013/12/20 02:02:24 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.h,v 1.35 2017/01/08 03:05:40 noro Exp $ */
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -8,7 +8,7 @@
 
 #if defined(__GNUC__)
 #define INLINE static inline
-#elif defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
+#elif defined(VISUAL) || defined(__MINGW32__)
 #define INLINE __inline
 #else
 #define INLINE
@@ -47,6 +47,7 @@ typedef struct oNDV {
 typedef union oNDC {
 	int m;
 	Q z;
+	LM lm;
 	GZ gz;
 	P p;
 	R r;
@@ -79,6 +80,7 @@ typedef struct oND_pairs {
 	struct oND_pairs *next;
 	int i1,i2;
 	int sugar;
+	int sugar2;
 	UINT lcm[1];
 } *ND_pairs;
 
@@ -142,11 +144,13 @@ extern int *current_module_weight_vector;
 #define HTD(d) (TD(HDL(d)))
 #define HCU(d) ((d)->body->c)
 #define HCM(d) ((d)->body->c.m)
+#define HCLM(d) ((d)->body->c.lm)
 #define HCQ(d) ((d)->body->c.z)
 #define HCZ(d) ((d)->body->c.gz)
 #define HCP(d) ((d)->body->c.p)
 #define HCA(d) ((d)->body->c.a)
 #define CM(x) ((x)->c.m)
+#define CLM(x) ((x)->c.lm)
 #define CQ(x) ((x)->c.z)
 #define CZ(x) ((x)->c.gz)
 #define CP(x) ((x)->c.p)
@@ -261,7 +265,7 @@ int ndv_newps(int m,NDV a,NDV aq,int f4);
 /* top level functions */
 void nd_gr(LIST f,LIST v,int m,int homo,int retdp,int f4,struct order_spec *ord,LIST *rp);
 void nd_gr_trace(LIST f,LIST v,int trace,int homo,int f4,struct order_spec *ord,LIST *rp);
-NODE nd_f4(int m,int **indp);
+NODE nd_f4(int m,int checkonly,int **indp);
 NODE nd_gb(int m,int ishomo,int checkonly,int gensyz,int **indp);
 NODE nd_gb_trace(int m,int ishomo,int **indp);
 NODE nd_f4_trace(int m,int **indp);