diff Modules/socketmodule.c @ 37732:bfc48ad81e80 legacy-trunk

Patch #1191065: Fix preprocessor problems on systems where recvfrom is a macro.
author Martin v. Löwis <martin@v.loewis.de>
date Sat, 15 Apr 2006 08:35:59 +0000
parents 289116a52bb1
children 29257ef6abeb
line wrap: on
line diff
--- a/Modules/socketmodule.c	Sat Apr 15 08:13:05 2006 +0000
+++ b/Modules/socketmodule.c	Sat Apr 15 08:35:59 2006 +0000
@@ -2208,18 +2208,20 @@
 	Py_BEGIN_ALLOW_THREADS
 	memset(&addrbuf, 0, addrlen);
 	timeout = internal_select(s, 0);
-	if (!timeout)
-		n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
+	if (!timeout) {
 #ifndef MS_WINDOWS
 #if defined(PYOS_OS2) && !defined(PYCC_GCC)
-			     (struct sockaddr *) &addrbuf, &addrlen
+		n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
+			     (struct sockaddr *) &addrbuf, &addrlen);
 #else
-			     (void *) &addrbuf, &addrlen
+		n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
+			     (void *) &addrbuf, &addrlen);
 #endif
 #else
-			     (struct sockaddr *) &addrbuf, &addrlen
-#endif
-			);
+		n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
+			     (struct sockaddr *) &addrbuf, &addrlen);
+#endif
+	}
 	Py_END_ALLOW_THREADS
 
 	if (timeout) {