[Glibc-bsd-commits] r3034 - in trunk/glibc-ports/kfreebsd: bits linuxthreads/bits

[Petr Salinger]

Author: ps-guest
Date: 2010-04-22 09:36:30 +0000 (Thu, 22 Apr 2010)
New Revision: 3034

Modified:
   trunk/glibc-ports/kfreebsd/bits/typesizes.h
   trunk/glibc-ports/kfreebsd/linuxthreads/bits/typesizes.h
Log:
be compatible with both linux and freebsd for fsid_t



Modified: trunk/glibc-ports/kfreebsd/bits/typesizes.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/typesizes.h	2010-04-22 06:33:59 UTC (rev 3033)
+++ trunk/glibc-ports/kfreebsd/bits/typesizes.h	2010-04-22 09:36:30 UTC (rev 3034)
@@ -56,7 +56,7 @@
 #define __CLOCKID_T_TYPE	__S32_TYPE
 #define __TIMER_T_TYPE		__S32_TYPE
 #define __BLKSIZE_T_TYPE	__U32_TYPE
-#define __FSID_T_TYPE		struct { int __val[2]; }
+#define __FSID_T_TYPE		union { int __val[2]; int val[2]; }
 #define __SSIZE_T_TYPE		__SWORD_TYPE
 
 /* Number of descriptors that can fit in an `fd_set'.  */

Modified: trunk/glibc-ports/kfreebsd/linuxthreads/bits/typesizes.h
===================================================================
--- trunk/glibc-ports/kfreebsd/linuxthreads/bits/typesizes.h	2010-04-22 06:33:59 UTC (rev 3033)
+++ trunk/glibc-ports/kfreebsd/linuxthreads/bits/typesizes.h	2010-04-22 09:36:30 UTC (rev 3034)
@@ -50,13 +50,13 @@
 #define __TIME_T_TYPE		__SLONGWORD_TYPE
 #define __USECONDS_T_TYPE	__U32_TYPE
 #define __SUSECONDS_T_TYPE	__SLONGWORD_TYPE
-#define __DADDR_T_TYPE		__S32_TYPE
+#define __DADDR_T_TYPE		__SQUAD_TYPE
 #define __SWBLK_T_TYPE		__S32_TYPE
 #define __KEY_T_TYPE		__SLONGWORD_TYPE
 #define __CLOCKID_T_TYPE	__S32_TYPE
 #define __TIMER_T_TYPE		__S32_TYPE
 #define __BLKSIZE_T_TYPE	__U32_TYPE
-#define __FSID_T_TYPE		struct { int __val[2]; }
+#define __FSID_T_TYPE		union { int __val[2]; int val[2]; }
 #define __SSIZE_T_TYPE		__SWORD_TYPE
 
 /* Number of descriptors that can fit in an `fd_set'.  */