[Brlcad-commits] CVS: brlcad/src/libpkg pkg.c,14.15,14.16

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/src/libpkg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv834/src/libpkg

Modified Files:
	pkg.c 
Log Message:
convert WIN32 define checks to _WIN32 since the latter is one of the defaults provided by MSVC whereas the prior is not.  remove some of them related to header inclusions using HAVE_ defines instead.

Index: pkg.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libpkg/pkg.c,v
retrieving revision 14.15
retrieving revision 14.16
diff -w -u -r14.15 -r14.16
--- pkg.c	11 May 2005 21:44:53 -0000	14.15
+++ pkg.c	28 May 2005 02:14:51 -0000	14.16
@@ -62,7 +62,7 @@
 #include <stdio.h>
 #include <ctype.h>		/* used by inet_addr() routine, below */
 
-#ifndef WIN32
+#ifndef _WIN32
 #  undef BSD	/* /usr/include/sys/param.h redefines this */
 #  include <sys/param.h>
 #  include <sys/time.h>
@@ -72,7 +72,7 @@
 #  include <time.h>
 #endif
 
-#ifndef WIN32
+#ifndef _WIN32
 #  include <sys/socket.h>
 #  include <sys/ioctl.h>		/* for FIONBIO */
 #  include <netinet/in.h>		/* for htons(), etc */
@@ -496,13 +496,8 @@
 #ifdef FIONBIO
 	if(nodelay)  {
 		onoff = 1;
-#ifdef WIN32
-		if( ioctlsocket(fd, FIONBIO, &onoff) < 0 )
-			pkg_perror( errlog, "pkg_getclient: FIONBIO 1" );
-#else
 		if( ioctl(fd, FIONBIO, &onoff) < 0 )
 			pkg_perror( errlog, "pkg_getclient: FIONBIO 1" );
-#endif
 	}
 #endif
 	do  {
@@ -510,7 +505,7 @@
 		if (s2 < 0) {
 			if(errno == EINTR)
 				continue;
-#ifdef WIN32
+#ifdef _WIN32
 			if(errno == WSAEWOULDBLOCK)
 				return(PKC_NULL);
 #else
@@ -524,17 +519,10 @@
 #ifdef FIONBIO
 	if(nodelay)  {		
 		onoff = 0;
-		#ifdef WIN32
-		if( ioctlsocket(fd, FIONBIO, &onoff) < 0 )
-			pkg_perror( errlog, "pkg_getclient: FIONBIO 2" );
-		if( ioctlsocket(s2, FIONBIO, &onoff) < 0 )
-			pkg_perror( errlog, "pkg_getclient: FIONBIO 3");
-#else
 		if( ioctl(fd, FIONBIO, &onoff) < 0 )
 			pkg_perror( errlog, "pkg_getclient: FIONBIO 2" );
 		if( ioctl(s2, FIONBIO, &onoff) < 0 )
 			pkg_perror( errlog, "pkg_getclient: FIONBIO 3");
-#endif
 	}
 #endif
 
@@ -1562,13 +1550,9 @@
 #  if HAVE_STRERROR
 #  else
 	sprintf( errbuf, "%s: %s\n", s, strerror(errno) );
-#    ifdef WIN32
-	sprintf( errbuf, "%s: %s\n", s, _sys_errlist[errno] );
-#    else
 	sprintf( errbuf, "%s: %s\n", s, sys_errlist[errno] );
 #    endif
 #  endif
-#endif
 	errlog( errbuf );
 }