===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/oxf.c,v
retrieving revision 1.19
retrieving revision 1.23
diff -u -p -r1.19 -r1.23
--- OpenXM/src/ox_toolkit/oxf.c	2005/03/03 04:40:51	1.19
+++ OpenXM/src/ox_toolkit/oxf.c	2015/08/27 03:03:33	1.23
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.18 2003/09/15 09:31:42 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.22 2015/08/21 00:53:53 noro Exp $ */
 
 /*
    This module includes functions for sending/receiveng CMO's.
@@ -10,10 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <fcntl.h>
-#include <sys/file.h>
-#include <sys/param.h>
 #include <time.h>
 #include <limits.h>
 
@@ -29,6 +26,17 @@
 #include <inttypes.h>
 #endif
 
+#if defined(_MSC_VER)
+#include <io.h>
+#define X_OK 0x01
+#define R_OK 0x04
+#define MAXHOSTNAMELEN 256
+#else
+#include <unistd.h>
+#include <sys/file.h>
+#include <sys/param.h>
+#endif
+
 #include "mysocket.h"
 #include "ox_toolkit.h"
 
@@ -41,8 +49,8 @@ static int receive_int32_nbo(OXFILE *oxfp);
 
 static int send_int64_nbo_le(OXFILE *oxfp, double int64);
 static int send_int64_lbo(OXFILE *oxfp, double int64);
-static int receive_int64_nbo_le(OXFILE *oxfp);
-static int receive_int64_lbo(OXFILE *oxfp);
+static double receive_int64_nbo_le(OXFILE *oxfp);
+static double receive_int64_lbo(OXFILE *oxfp);
 
 static void pipe_send_info(int fd, char *hostname, int port, char *password);
 
@@ -77,7 +85,11 @@ int oxf_read(void *buffer, size_t size, size_t num, OX
 {
     int n = read(oxfp->fd, buffer, size*num);
     if (n <= 0) {
+#if 0
         oxfp->error = 1;
+#else
+        exit(0);
+#endif
     }
     return n;
 }
@@ -111,17 +123,17 @@ static int send_int64_lbo(OXFILE *oxfp, double int64)
 }
 
 /* receiving an object of int64 type with Network Byte Order. */
-static int receive_int64_nbo_le(OXFILE *oxfp)
+static double receive_int64_nbo_le(OXFILE *oxfp)
 {
-    int tag;
+    double tag;
     oxf_read(&tag, sizeof(double), 1, oxfp);
     return htonll_le(tag);
 }
 
 /* receiving an object of int64 type with Local Byte Order. */
-static int receive_int64_lbo(OXFILE *oxfp)
+static double receive_int64_lbo(OXFILE *oxfp)
 {
-    int tag;
+    double tag;
     oxf_read(&tag, sizeof(double), 1, oxfp);
     return tag;
 }