=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v retrieving revision 1.60 retrieving revision 1.63 diff -u -p -r1.60 -r1.63 --- OpenXM_contrib2/asir2000/io/tcpf.c 2011/01/18 09:09:22 1.60 +++ OpenXM_contrib2/asir2000/io/tcpf.c 2013/06/13 18:40:31 1.63 @@ -44,7 +44,7 @@ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. - * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.59 2010/12/12 03:20:53 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.62 2012/12/17 07:20:45 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -58,8 +58,8 @@ #endif #include "ox.h" -#if defined(VISUAL) #include +#if defined(VISUAL) #include #include #endif @@ -213,7 +213,8 @@ extern struct IOFP iofp[]; extern MATHCAP my_mathcap; extern int ox_exchange_mathcap; -char *getenv(); +Obj asir_pop_one(); +void asir_push_one(Obj); void Pnd_exec_f4_red(Q *rp) { @@ -1611,7 +1612,7 @@ int validate_ox_plot_stream(int index) /* create an ox_plot server */ MKSTR(name,"ox_plot"); - arg = mknode(2,0,name); + arg = mknode(2,NULL,name); Pox_launch_nox(arg,&r); i = QTOS((Q)r); #if defined(VISUAL) @@ -1642,9 +1643,9 @@ int register_102(int s1,int rank,int is_master) iofp_102[rank].out = fdopen(s1,"w"); #if !defined(__CYGWIN__) setbuffer(iofp_102[rank].in,iofp_102[rank].inbuf = - (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); + (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); setbuffer(iofp_102[rank].out,iofp_102[rank].outbuf = - (char *)GC_malloc_atomic(LBUFSIZ),LBUFSIZ); + (char *)MALLOC_ATOMIC(LBUFSIZ),LBUFSIZ); #endif #endif if ( little_endian )