From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 3 Mar 2001 21:41:33 +0000 (+0000)
Subject: [ID 20010303.009] SOCKS5 work around breaks other sockets
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=405b39414254316617f9eff6eba0472cb6c4cb70;p=p5sagit%2Fp5-mst-13.2.git

[ID 20010303.009] SOCKS5 work around breaks other sockets
Message-Id: <E14ZJmP-0000mE-00@Bagpuss.unfortu.net>

Revert the workaround.

p4raw-id: //depot/perl@9023
---

diff --git a/perlio.c b/perlio.c
index 9f12be6..c8047f8 100644
--- a/perlio.c
+++ b/perlio.c
@@ -1825,12 +1825,12 @@ IV
 PerlIOStdio_close(PerlIO *f)
 {
  dTHX;
-#ifdef HAS_SOCKET
+#ifdef HAS_SOCKS5_INIT
  int optval, optlen = sizeof(int);
 #endif
  FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio;
  return(
-#ifdef HAS_SOCKET
+#ifdef HAS_SOCKS5_INIT
    (getsockopt(PerlIO_fileno(f), SOL_SOCKET, SO_TYPE, (char *)&optval, &optlen) < 0) ?
        PerlSIO_fclose(stdio) :
        close(PerlIO_fileno(f))