patch-2.0.1 linux/include/asm-i386/posix_types.h

• Lines: 42
• Date: Tue Jul 2 19:08:43 1996
• Orig file: v2.0.0/linux/include/asm-i386/posix_types.h
• Orig date: Mon Jun 3 16:46:58 1996

diff -u --recursive --new-file v2.0.0/linux/include/asm-i386/posix_types.h linux/include/asm-i386/posix_types.h
@@ -28,32 +28,36 @@
 #endif
 
 typedef struct {
+#if defined(__KERNEL__) || defined(__USE_ALL)
 	int	val[2];
+#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
+	int	__val[2];
+#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
 } __kernel_fsid_t;
 
 #undef	__FD_SET
 #define __FD_SET(fd,fdsetp) \
 		__asm__ __volatile__("btsl %1,%0": \
-			"=m" (*(fd_set *) (fdsetp)):"r" ((int) (fd)))
+			"=m" (*(__kernel_fd_set *) (fdsetp)):"r" ((int) (fd)))
 
 #undef	__FD_CLR
 #define __FD_CLR(fd,fdsetp) \
 		__asm__ __volatile__("btrl %1,%0": \
-			"=m" (*(fd_set *) (fdsetp)):"r" ((int) (fd)))
+			"=m" (*(__kernel_fd_set *) (fdsetp)):"r" ((int) (fd)))
 
 #undef	__FD_ISSET
 #define __FD_ISSET(fd,fdsetp) (__extension__ ({ \
 		unsigned char __result; \
 		__asm__ __volatile__("btl %1,%2 ; setb %0" \
 			:"=q" (__result) :"r" ((int) (fd)), \
-			"m" (*(fd_set *) (fdsetp))); \
+			"m" (*(__kernel_fd_set *) (fdsetp))); \
 		__result; }))
 
 #undef	__FD_ZERO
 #define __FD_ZERO(fdsetp) \
 		__asm__ __volatile__("cld ; rep ; stosl" \
-			:"=m" (*(fd_set *) (fdsetp)) \
+			:"=m" (*(__kernel_fd_set *) (fdsetp)) \
 			:"a" (0), "c" (__FDSET_INTS), \
-			"D" ((fd_set *) (fdsetp)) :"cx","di")
+			"D" ((__kernel_fd_set *) (fdsetp)) :"cx","di")
 
 #endif