[Python-checkins] python/dist/src/Modules socketmodule.c,1.213,1.214
jackjansen@sourceforge.net
jackjansen@sourceforge.net
Thu, 11 Apr 2002 13:44:19 -0700
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv8215/Python/Modules
Modified Files:
socketmodule.c
Log Message:
Got rid of ifdefs for long-obsolete GUSI versions.
Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** socketmodule.c 1 Apr 2002 14:53:37 -0000 1.213
--- socketmodule.c 11 Apr 2002 20:44:16 -0000 1.214
***************
*** 150,156 ****
typedef size_t socklen_t;
# else
- # ifndef USE_GUSI1
# include <arpa/inet.h>
- # endif
# endif
--- 150,154 ----
***************
*** 182,190 ****
#endif
- #ifdef USE_GUSI1
- /* fdopen() isn't declared in stdio.h (sigh) */
- # include <GUSI.h>
- #endif
-
#include "addrinfo.h"
--- 180,183 ----
***************
*** 2333,2341 ****
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 */
--- 2326,2330 ----
***************
*** 3332,3340 ****
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;
--- 3321,3325 ----