[Glibc-bsd-commits] r3742 - in trunk/glibc-ports/kfreebsd: . sys

[Petr Salinger]

Author: ps-guest
Date: 2011-10-18 06:53:37 +0000 (Tue, 18 Oct 2011)
New Revision: 3742

Modified:
   trunk/glibc-ports/kfreebsd/sa_len.c
   trunk/glibc-ports/kfreebsd/sys/un.h
Log:
restrict sockaddr_un kludge to platforms that really need it



Modified: trunk/glibc-ports/kfreebsd/sa_len.c
===================================================================
--- trunk/glibc-ports/kfreebsd/sa_len.c	2011-10-17 22:08:25 UTC (rev 3741)
+++ trunk/glibc-ports/kfreebsd/sa_len.c	2011-10-18 06:53:37 UTC (rev 3742)
@@ -37,7 +37,7 @@
     case AF_IPX:
       return sizeof (struct sockaddr_ipx);
     case AF_LOCAL:
-      return sizeof (struct sockaddr_un) - sizeof(((struct sockaddr_un *) 0)->__sun_user_compat);
+      return __SOCKADDR_COMMON_SIZE + sizeof(((struct sockaddr_un *) 0)->sun_path);
     }
   return 0;
 }

Modified: trunk/glibc-ports/kfreebsd/sys/un.h
===================================================================
--- trunk/glibc-ports/kfreebsd/sys/un.h	2011-10-17 22:08:25 UTC (rev 3741)
+++ trunk/glibc-ports/kfreebsd/sys/un.h	2011-10-18 06:53:37 UTC (rev 3742)
@@ -31,7 +31,9 @@
   {
     __SOCKADDR_COMMON (sun_);
     char sun_path[104];		/* Path name, the kernel restrict it to 104, */
+#if defined(__i386__) || defined(__amd64__)
     char __sun_user_compat[4];  /* but former user header used 108 */
+#endif    
   };