Before declaring h_errno, do not check for Win32 only. Instead, do check

whether h_errno is a macro.

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

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);