for(;;), sort

[p5sagit/p5-mst-13.2.git] / perlio.c

diff --git a/perlio.c b/perlio.c
index dc1bba1..3f15c4e 100644 (file)
--- a/perlio.c
+++ b/perlio.c
@@ -853,7 +853,7 @@ PerlIO_fdupopen(pTHX_ PerlIO *f)
  else
   {
    SETERRNO(EBADF,SS$_IVCHAN);
-   return -1;
+   return NULL;
   }
 }
 
@@ -2187,13 +2187,13 @@ IV
 PerlIOStdio_close(PerlIO *f)
 {
  dTHX;
-#ifdef HAS_SOCKS5_INIT
+#ifdef SOCKS5_VERSION_NAME
  int optval;
  Sock_size_t optlen = sizeof(int);
 #endif
  FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio;
  return(
-#ifdef HAS_SOCKS5_INIT
+#ifdef SOCKS5_VERSION_NAME
    (getsockopt(PerlIO_fileno(f), SOL_SOCKET, SO_TYPE, (void *)&optval, &optlen) < 0) ?
        PerlSIO_fclose(stdio) :
        close(PerlIO_fileno(f))