From cc7bb579b0707b5505133c140c8e1c2dbe45aec5 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 17 May 2005 09:06:12 +0000
Subject: [PATCH] From Thom DeCarlo, build fixes for Cygwin.

---
 Make/makedefs                     | 3 ++-
 src/osgPlugins/net/sockstream.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Make/makedefs b/Make/makedefs
index b18f696a0..295f387e3 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -538,6 +538,7 @@ ifeq ($(OS),CYGWIN)
   C++               = c++
   DEPARG            = -M -DWIN32
   INC               += 
+  LIB               =
   DEF               += -DWIN32 -W -Wall -DNOMINMAX
   OPTF              = -O2 
   DBGF              = -g -DOSG_COMPILE_UNIT_TESTS
@@ -558,7 +559,7 @@ ifeq ($(OS),CYGWIN)
   SOCKET_LIBS       = 
   OTHER_LIBS        = -lOpenThreads
   PNG_LIBS          = -lpng -lz
-  JPEG_LIBS         = -ljpeg
+  JPEG_LIBS         = -L/usr/local/lib -ljpeg
   GIF_LIBS          = -lungif
   TIFF_LIB          = -ltiff -lz -ljpeg
 
diff --git a/src/osgPlugins/net/sockstream.cpp b/src/osgPlugins/net/sockstream.cpp
index 58ac996be..d19f63e4b 100644
--- a/src/osgPlugins/net/sockstream.cpp
+++ b/src/osgPlugins/net/sockstream.cpp
@@ -64,7 +64,7 @@
 #include <sstream>
 #include <string>
 
-#if (defined(__APPLE__)&&(__GNUC__<4)) || defined(WIN32) || defined (__sgi) || defined (__hpux) 
+#if (defined(__APPLE__)&&(__GNUC__<4)) || (defined(WIN32)&&!defined(__CYGWIN__)) || defined (__sgi) || defined (__hpux) 
 typedef int socklen_t;
 #endif