Mercurial > hg > xemacs-beta
diff src/process-unix.c @ 410:de805c49cfc1 r21-2-35
Import from CVS: tag r21-2-35
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:19:21 +0200 |
| parents | b8cc9ab3f761 |
| children | 697ef44129c6 |
line wrap: on
line diff
--- a/src/process-unix.c Mon Aug 13 11:18:12 2007 +0200 +++ b/src/process-unix.c Mon Aug 13 11:19:21 2007 +0200 @@ -779,7 +779,7 @@ UNIX_DATA(p)->subtty = forkin; { -#if !defined(__CYGWIN32__) +#if !defined(CYGWIN) /* child_setup must clobber environ on systems with true vfork. Protect it from permanent change. */ char **save_environ = environ; @@ -938,7 +938,7 @@ } /**** End of child code ****/ /**** Back in parent process ****/ -#if !defined(__CYGWIN32__) +#if !defined(CYGWIN) environ = save_environ; #endif } @@ -1855,7 +1855,7 @@ imr.imr_multiaddr.s_addr = htonl (inet_addr ((char *) XSTRING_DATA (dest))); imr.imr_interface.s_addr = htonl (INADDR_ANY); if (setsockopt (rs, IPPROTO_IP, IP_ADD_MEMBERSHIP, - (char *) &imr, sizeof (struct ip_mreq)) < 0) + &imr, sizeof (struct ip_mreq)) < 0) { close (ws); close (rs); @@ -1921,7 +1921,7 @@ /* scope */ if (setsockopt (ws, IPPROTO_IP, IP_MULTICAST_TTL, - (char *) &thettl, sizeof (thettl)) < 0) + &thettl, sizeof (thettl)) < 0) { close (rs); close (ws);