diff Modules/socketmodule.c @ 22957:4f9d5ea4f37d legacy-trunk

Got rid of ifdefs for long-obsolete GUSI versions.
author Jack Jansen <jack.jansen@cwi.nl>
date Thu, 11 Apr 2002 20:46:23 +0000
parents cdff3c7c1a76
children 72778ec94dec
line wrap: on
line diff
--- a/Modules/socketmodule.c	Thu Apr 11 20:41:18 2002 +0000
+++ b/Modules/socketmodule.c	Thu Apr 11 20:46:23 2002 +0000
@@ -149,9 +149,7 @@
 #  include <netdb.h>
 typedef size_t socklen_t;
 # else
-#  ifndef USE_GUSI1
 #   include <arpa/inet.h>
-#  endif
 # endif
 
 # ifndef RISCOS
@@ -181,11 +179,6 @@
 # define O_NDELAY O_NONBLOCK	/* For QNX only? */
 #endif
 
-#ifdef USE_GUSI1
-/* fdopen() isn't declared in stdio.h (sigh) */
-# include <GUSI.h>
-#endif
-
 #include "addrinfo.h"
 
 #ifndef HAVE_INET_PTON
@@ -2332,11 +2325,7 @@
 	if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr)) {
 		return NULL;
 	}
-#ifdef USE_GUSI1
-	packed_addr = inet_addr(ip_addr).s_addr;
-#else
 	packed_addr = inet_addr(ip_addr);
-#endif
 
 	if (packed_addr == INADDR_NONE) {	/* invalid address */
 		PyErr_SetString(PySocket_Error,
@@ -3331,11 +3320,7 @@
 {
 	if(af == AF_INET){
 		long packed_addr;
-#ifdef USE_GUSI1
-		packed_addr = (long)inet_addr(src).s_addr;
-#else
 		packed_addr = inet_addr(src);
-#endif
 		if (packed_addr == INADDR_NONE)
 			return 0;
 		memcpy(dst, &packed_addr, 4);