From 67aa3792e5caf799fcaafafd4969b47d04b98df1 Mon Sep 17 00:00:00 2001
From: Don BURNS <don@andesengineering.com>
Date: Wed, 10 Nov 2004 16:56:58 +0000
Subject: [PATCH] More cleanups for CYGWIN from Norman Vine

---
 src/osgPlugins/net/sockstream.cpp | 5 +++--
 src/osgPlugins/net/sockstream.h   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/net/sockstream.cpp b/src/osgPlugins/net/sockstream.cpp
index 41ff364b3..eb229df32 100644
--- a/src/osgPlugins/net/sockstream.cpp
+++ b/src/osgPlugins/net/sockstream.cpp
@@ -899,7 +899,7 @@ bool sockbuf::atmark () const
 // return true, if the read pointer for socket points to an
 // out of band data
 {
-#if !(defined(__CYGWIN__) || defined(WIN32))
+#if !defined(WIN32) || defined(__CYGWIN__) 
 	int arg;
   if (::ioctl (rep->sock, SIOCATMARK, &arg) == -1)
     throw sockerr (errno, "sockbuf::atmark", sockname.c_str());
@@ -911,7 +911,8 @@ bool sockbuf::atmark () const
   return arg!=0;
 }
 
-#if !(defined(__CYGWIN__) || defined(WIN32))
+#if !defined(WIN32)
+//#if !(defined(__CYGWIN__) || defined(WIN32))
 int sockbuf::pgrp () const
 // return the process group id that would receive SIGIO and SIGURG
 // signals
diff --git a/src/osgPlugins/net/sockstream.h b/src/osgPlugins/net/sockstream.h
index ba5c70d0a..5227cdf4a 100644
--- a/src/osgPlugins/net/sockstream.h
+++ b/src/osgPlugins/net/sockstream.h
@@ -49,8 +49,10 @@
 #else
 #  include <windows.h>
 #  include <Wininet.h>
+#ifdef _MSC_VER 
 #  pragma comment(lib, "Wininet")
 #endif
+#endif
 
 #ifdef __sgi
 typedef int socklen_t;
@@ -316,7 +318,7 @@ class sockbuf: public streambuf
 #if defined(__CYGWIN__) || !defined(WIN32)
         void async(bool set=true) const;
 #endif
-#if !defined(__CYGWIN__) || !defined(WIN32)
+#if !defined(WIN32)
         int  pgrp() const;
         int  pgrp(int new_pgrp) const;
         void closeonexec(bool set=true) const;