Changeset 3758 for branches

Timestamp:

Mar 5, 2012, 2:26:32 AM (13 years ago)

Author:

bird

Message:

Backported r3757: sys/socket.h: Use _ALIGN instead of ALIGN because of _NO_NAMESPACE_POLLUTION. Fixes #236.

File:

• branches/libc-0.6/src/emx/include/sys/socket.h (modified) (1 diff)

branches/libc-0.6/src/emx/include/sys/socket.h

@@ -388 +388 @@
             (mhdr)->msg_control + (mhdr)->msg_controllen) ? \
             (struct cmsghdr *)NULL : \
-            (struct cmsghdr *)((caddr_t)(cmsg) + ALIGN((cmsg)->cmsg_len)))
+            (struct cmsghdr *)((caddr_t)(cmsg) + _ALIGN((cmsg)->cmsg_len)))
 
 #define CMSG_FIRSTHDR(mhdr)     ((struct cmsghdr *)(mhdr)->msg_control)