=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/oxf.c,v retrieving revision 1.22 retrieving revision 1.24 diff -u -p -r1.22 -r1.24 --- OpenXM/src/ox_toolkit/oxf.c 2015/08/21 00:53:53 1.22 +++ OpenXM/src/ox_toolkit/oxf.c 2016/06/30 01:14:00 1.24 @@ -1,19 +1,18 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.21 2015/08/05 00:59:05 noro Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/oxf.c,v 1.23 2015/08/27 03:03:33 ohara Exp $ */ /* This module includes functions for sending/receiveng CMO's. - Some commnets are written in Japanese by the EUC-JP coded - character set. */ +#if defined(_MSC_VER) +#define _CRT_RAND_S +#endif + #include #include #include -#include #include -#include -#include #include #include @@ -29,6 +28,25 @@ #include #endif +#if defined(_MSC_VER) +#include +#include +#define X_OK 0x01 +#define R_OK 0x04 +#define MAXHOSTNAMELEN 256 +#define srandom(s) (srand((s))) +static int random() +{ + int r; + rand_s(&r); + return r; +} +#else +#include +#include +#include +#endif + #include "mysocket.h" #include "ox_toolkit.h" @@ -357,6 +375,7 @@ char *which(char *exe, const char *env) return NULL; } +#if !defined(_MSC_VER) /* Remarks: ssh determines remote host by his name, i.e. by arg[0]. */ int oxc_start(char *remote_host, int port, char *passwd) { @@ -400,6 +419,7 @@ int oxc_start_with_pipe(char *remote_host, int port, c } return pid; } +#endif static void pipe_send_string(int fd, char *s) {