Messages in this thread Patch in this message | | | Date | Sat, 28 Mar 1998 02:12:22 -0500 | From | "Theodore Y. Ts'o" <> | Subject | Quick include file fix for 2.1.91 |
| |
Hi Linus,
This quick fix eliminates a lot of warning messages when compiling e2fsprogs under glibc. This is because the glibc header files defines its own version of FD_SET, FD_ZERO, etc., and so if you need to #include the kernel include files, you get a lot of duplicate defined macro warning messages. This patch simply #ifdef's out the kernel versions of these function if the kernel is not being compiled and the glibc header files are in use.
Could you please apply this patch for 2.1.92? Thanks!!
- Ted
Patch generated: on Sat Mar 28 02:06:52 EST 1998 by tytso@rsts-11.mit.edu against Linux version 2.1.91
=================================================================== RCS file: include/asm-i386/RCS/posix_types.h,v retrieving revision 1.1 diff -u -r1.1 include/asm-i386/posix_types.h --- include/asm-i386/posix_types.h 1998/03/28 04:49:29 1.1 +++ include/asm-i386/posix_types.h 1998/03/28 04:49:32 @@ -37,6 +37,8 @@ #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ } __kernel_fsid_t; +#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) + #undef __FD_SET #define __FD_SET(fd,fdsetp) \ __asm__ __volatile__("btsl %1,%0": \ @@ -61,5 +63,7 @@ :"=m" (*(__kernel_fd_set *) (fdsetp)) \ :"a" (0), "c" (__FDSET_LONGS), \ "D" ((__kernel_fd_set *) (fdsetp)) :"cx","di") + +#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ #endif - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu
| |