Patch #725942: Always rename emulation functions.

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index fd6ede0ea7826b5d4189f9d5b139f3b43aeb88ba..b9e9bd4bd78a657583b9844dd8c27352c88d549f 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -251,16 +251,19 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
    Find to check for Jaguar is that it has getnameinfo(), which
    older releases don't have */
 #undef HAVE_GETADDRINFO
-/* avoid clashes with the C library definition of the symbol. */
-#define getaddrinfo fake_getaddrinfo
 #endif
 #endif
 
 /* I know this is a bad practice, but it is the easiest... */
 #if !defined(HAVE_GETADDRINFO)
+/* avoid clashes with the C library definition of the symbol. */
+#define getaddrinfo fake_getaddrinfo
+#define gai_strerror fake_gai_strerror
+#define freeaddrinfo fake_freeaddrinfo
 #include "getaddrinfo.c"
 #endif
 #if !defined(HAVE_GETNAMEINFO)
+#define getnameinfo fake_getnameinfo
 #include "getnameinfo.c"
 #endif