SF patch #1670209, Remove Py_PROTO from socket by Pete Shinners.

diff --git a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c
index 4d19c3424261f04965299b74911a09001f4ef915..5bcec2b2111737c05e56edf28d6cfaff0b42d33f 100644 (file)
--- a/Modules/getaddrinfo.c
+++ b/Modules/getaddrinfo.c
@@ -129,12 +129,12 @@ static struct gai_afd {
 #define IN_LOOPBACKNET     127
 #endif
 
-static int get_name Py_PROTO((const char *, struct gai_afd *,
+static int get_name(const char *, struct gai_afd *,
                          struct addrinfo **, char *, struct addrinfo *,
-                         int));
-static int get_addr Py_PROTO((const char *, int, struct addrinfo **,
-                       struct addrinfo *, int));
-static int str_isnumber Py_PROTO((const char *));
+                         int);
+static int get_addr(const char *, int, struct addrinfo **,
+                       struct addrinfo *, int);
+static int str_isnumber(const char *);
        
 static char *ai_errlist[] = {
        "success.",

diff --git a/Modules/getnameinfo.c b/Modules/getnameinfo.c
index d3c0ac537317fa7074921bcf2a50913173b4aad4..0190a3225c0ffc57206275bcd5a49647709d29c2 100644 (file)
--- a/Modules/getnameinfo.c
+++ b/Modules/getnameinfo.c
@@ -82,8 +82,8 @@ struct gni_sockinet {
 #define ENI_SALEN      6
 
 /* forward declaration to make gcc happy */
-int getnameinfo Py_PROTO((const struct sockaddr *, size_t, char *, size_t,
-                         char *, size_t, int));
+int getnameinfo(const struct sockaddr *, size_t, char *, size_t,
+                         char *, size_t, int);
 
 int
 getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)