===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.35
retrieving revision 1.39
diff -u -p -r1.35 -r1.39
--- OpenXM_contrib2/asir2000/include/ca.h	2003/02/14 22:29:13	1.35
+++ OpenXM_contrib2/asir2000/include/ca.h	2003/11/08 01:12:03	1.39
@@ -45,17 +45,18 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.34 2002/11/22 07:32:11 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.38 2003/10/20 07:18:42 saito Exp $ 
 */
 #include <stdio.h>
+#include <stdlib.h>
 
 #if defined(hpux)
 #include <netinet/in.h>
 # define setbuffer(FP,buf,siz) setvbuf(FP,buf,_IOFBF,siz)
 #endif
 
-#if defined(VISUAL)
-#include <stdlib.h>
+#if !defined(VISUAL)
+#include <unistd.h>
 #endif
 
 #if !defined(VISUAL)
@@ -81,12 +82,16 @@ typedef caddr_t pointer;
 
 typedef void * pointer;
 
-#if defined(VISUAL)
+#if defined(sun)
+#include <strings.h>
+#else
 #include <string.h>
+#if defined(VISUAL)
 #define index(s,c) strchr(s,c)
 #define bzero(s,len) memset(s,0,len)
 #define bcopy(x,y,len) memcpy(y,x,len)
 #endif
+#endif
 
 #define COPY(a,b) ((b)=(a))
 #define FREEN(p) 
@@ -113,6 +118,7 @@ typedef void * pointer;
 #define O_GFMMAT 15
 #define O_BYTEARRAY 16
 #define O_QUOTE 17
+#define O_OPTLIST 18
 #define O_VOID -1
 
 #define N_Q 0
@@ -349,6 +355,12 @@ typedef struct oQUOTE {
 	pointer body;
 } *QUOTE;
 
+typedef struct oOPTLIST {
+	short id;
+	short pad;
+	struct oNODE *body;
+} *OPTLIST;
+
 typedef struct oObj {
 	short id;
 	short pad;
@@ -414,6 +426,11 @@ typedef struct oDLBUCKET {
 	struct oDLBUCKET *next;
 } *DLBUCKET;
 
+typedef struct oGeoBucket {
+	int m;
+	struct oNODE *body[32];
+} *GeoBucket;
+
 typedef struct oVL {
 	V v;
 	struct oVL *next;
@@ -651,6 +668,7 @@ bzero((char *)(q)->b,(w)*sizeof(unsigned int)))
 #define NEWMATHCAP(e) ((e)=(MATHCAP)MALLOC(sizeof(struct oMATHCAP)),OID(e)=O_MATHCAP)
 #define NEWBYTEARRAY(e) ((e)=(BYTEARRAY)MALLOC(sizeof(struct oBYTEARRAY)),OID(e)=O_BYTEARRAY)
 #define NEWQUOTE(e) ((e)=(QUOTE)MALLOC(sizeof(struct oQUOTE)),OID(e)=O_QUOTE)
+#define NEWOPTLIST(l) ((l)=(OPTLIST)MALLOC(sizeof(struct oOPTLIST)),OID(l)=O_OPTLIST)
 
 #define NEWNODE(a) ((a)=(NODE)MALLOC(sizeof(struct oNODE)))
 #define NEWDC(dc) ((dc)=(DCP)MALLOC(sizeof(struct oDCP)))
@@ -845,6 +863,7 @@ extern VL CO,ALG;
 extern VL PVL;
 extern R ONER;
 extern Q ONE;
+extern Q TWO;
 extern MQ ONEM;
 extern LM ONELM;
 extern N ONEN;