[Python-checkins] CVS: python/dist/src/Modules getaddrinfo.c,1.4,1.5 socketmodule.c,1.154,1.155

[Martin v. L?wis]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv32221

Modified Files:
	getaddrinfo.c socketmodule.c 
Log Message:
Before declaring h_errno, do not check for Win32 only. Instead, do check 
whether h_errno is a macro.


Index: getaddrinfo.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/getaddrinfo.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** getaddrinfo.c	2001/07/21 18:48:56	1.4
--- getaddrinfo.c	2001/07/23 07:27:16	1.5
***************
*** 545,549 ****
  	int i, error = 0, h_error;
  	char *ap;
! #if !defined(INET6) && !defined(MS_WIN32)
  	/* In winsock.h, h_errno is #defined as a function call. */
  	extern int h_errno;
--- 545,549 ----
  	int i, error = 0, h_error;
  	char *ap;
! #if !defined(INET6) && !defined(h_errno)
  	/* In winsock.h, h_errno is #defined as a function call. */
  	extern int h_errno;

Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -r1.154 -r1.155
*** socketmodule.c	2001/07/23 01:30:10	1.154
--- socketmodule.c	2001/07/23 07:27:16	1.155
***************
*** 1790,1794 ****
  	if (h == NULL) {
  		/* Let's get real error message to return */
! #ifndef MS_WIN32
  		extern int h_errno;
  #endif
--- 1790,1794 ----
  	if (h == NULL) {
  		/* Let's get real error message to return */
! #ifndef h_errno
  		extern int h_errno;
  #endif