summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2001-07-23 07:27:16 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2001-07-23 07:27:16 (GMT)
commitfe36fc91ed08537f4b2ee728bcf4a00dc9ee29dd (patch)
treed215df73ff937276e58e414194c7facd4df520f5
parent4c81d60fcb15661450a3aab72de26d72e32fd4f0 (diff)
downloadcpython-fe36fc91ed08537f4b2ee728bcf4a00dc9ee29dd.zip
cpython-fe36fc91ed08537f4b2ee728bcf4a00dc9ee29dd.tar.gz
cpython-fe36fc91ed08537f4b2ee728bcf4a00dc9ee29dd.tar.bz2
Before declaring h_errno, do not check for Win32 only. Instead, do check
whether h_errno is a macro.
-rw-r--r--Modules/getaddrinfo.c2
-rw-r--r--Modules/socketmodule.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c
index 9bc9917..7d07e53 100644
--- a/Modules/getaddrinfo.c
+++ b/Modules/getaddrinfo.c
@@ -544,7 +544,7 @@ get_addr(hostname, af, res, pai, port0)
struct gai_afd *gai_afd;
int i, error = 0, h_error;
char *ap;
-#if !defined(INET6) && !defined(MS_WIN32)
+#if !defined(INET6) && !defined(h_errno)
/* In winsock.h, h_errno is #defined as a function call. */
extern int h_errno;
#endif
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 7fa8264..1c19c28 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1789,7 +1789,7 @@ gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af)
if (h == NULL) {
/* Let's get real error message to return */
-#ifndef MS_WIN32
+#ifndef h_errno
extern int h_errno;
#endif
PyH_Err(h_errno);