FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More cleanups for CYGWIN from Norman Vine

Browse Source
This commit is contained in:
Don BURNS
2004-11-10 16:56:58 +00:00
parent 4973824b1d
commit 67aa3792e5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osgPlugins/net/sockstream.cpp
View File

@@ -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

4
src/osgPlugins/net/sockstream.h
View File

@@ -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;