=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_launch.c,v retrieving revision 1.22 retrieving revision 1.24 diff -u -p -r1.22 -r1.24 --- OpenXM_contrib2/asir2000/io/ox_launch.c 2009/03/03 14:57:32 1.22 +++ OpenXM_contrib2/asir2000/io/ox_launch.c 2011/02/06 07:07:39 1.24 @@ -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/ox_launch.c,v 1.21 2006/09/26 05:35:26 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/io/ox_launch.c,v 1.23 2010/09/01 08:01:09 noro Exp $ */ #include #include @@ -274,7 +274,7 @@ char *nolog; DuplicateHandle(GetCurrentProcess(),(HANDLE)bs, GetCurrentProcess(),(HANDLE *)&newbs, 0,TRUE,DUPLICATE_SAME_ACCESS); - close(bs); + closesocket(bs); bs = newbs; mypid = GetCurrentProcessId(); @@ -338,7 +338,7 @@ char *nolog; #endif } if ( !nolog && !strcmp(dname,"1" ) ) /* XXX: for ssh */ - execl(prog,prog,0); + execl(prog,prog,(char *)0); else if ( nolog || !strcmp(dname,"0") ) { FILE *null; @@ -348,15 +348,15 @@ char *nolog; if ( !strcmp(dname,"1") ) { /* XXX */ putenv("DISPLAY="); - execl(prog,prog,0); + execl(prog,prog,(char *)0); } else if ( strcmp(dname,"0") ) - execl(prog,prog,"-display",dname,0); + execl(prog,prog,"-display",dname,(char *)0); else { putenv("DISPLAY="); - execl(prog,prog,0); + execl(prog,prog,(char *)0); } } else - execl(prog,prog,"-display",dname,0); + execl(prog,prog,"-display",dname,(char *)0); /* On failure */ errcode = 2; write(4,&errcode,1);