diff --git a/socket/bits/socket2.h b/socket/bits/socket2.h
index 6998dca20d..aec41b3a96 100644
--- a/socket/bits/socket2.h
+++ b/socket/bits/socket2.h
@@ -24,14 +24,14 @@
 extern void __chk_fail (void) __attribute__((noreturn));
 #define recv(fd, buf, n, flags) \
   (__extension__							      \
-    ({ size_t __n_val = (__n);				  		      \
+    ({ size_t __n_val = (n);				  		      \
        if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __n_val)	      \
          __chk_fail ();							      \
-       recv (fd, buf, __n_val, flags); }))
+       recv ((fd), (buf), __n_val, (flags)); }))
 
 #define recvfrom(fd, buf, n, flags, addr, addr_len) \
   (__extension__							      \
-    ({ size_t __n_val = (__n);				  		      \
+    ({ size_t __n_val = (n);				  		      \
        if (__bos0 (buf) != (size_t) -1 && __bos0 (buf) < __n_val)	      \
          __chk_fail ();							      \
-       recvfrom (fd, buf, __n_val, flags, addr, addr_len); }))
+       recvfrom ((fd, (buf), __n_val, (flags), (addr), (addr_len)); }))