more header problems - 2.2.2 vs. linux 2.4.1

[Lynn Winebarger]

It appears there are conflicts between <string.h> and
<linux/string.h>
Why are both of these being included?  These confilcts
have occured in compiling timed, sash, and hdparm (3.9).
They're including <linux/fs.h> which then includes <linux/string.h>.

Also, there are conflicts between sys/mount.h and linux/fs.h

Does anyone know how to resolve these conflicts?  I don't know if there's
any special reason why the kernel string implementations should be used
in general headers.

Lynn

The compiler complaints are like this:

cc -O3 -Wall -Wmissing-prototypes -DHAVE_GZIP -DHAVE_EXT2   -c -o cmds.o 
cmds.c
In file included from cmds.c:19:
/usr/include/linux/fs.h:47: warning: `BLOCK_SIZE' redefined
/usr/include/sys/mount.h:28: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:99: warning: `MS_RDONLY' redefined
/usr/include/sys/mount.h:37: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:100: warning: `MS_NOSUID' redefined
/usr/include/sys/mount.h:39: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:101: warning: `MS_NODEV' redefined
/usr/include/sys/mount.h:41: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:102: warning: `MS_NOEXEC' redefined
/usr/include/sys/mount.h:43: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:103: warning: `MS_SYNCHRONOUS' redefined
/usr/include/sys/mount.h:45: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:104: warning: `MS_REMOUNT' redefined
/usr/include/sys/mount.h:47: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:105: warning: `MS_MANDLOCK' redefined
/usr/include/sys/mount.h:49: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:106: warning: `MS_NOATIME' redefined
/usr/include/sys/mount.h:57: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:107: warning: `MS_NODIRATIME' redefined
/usr/include/sys/mount.h:59: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:108: warning: `MS_BIND' redefined
/usr/include/sys/mount.h:61: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:114: warning: `MS_RMT_MASK' redefined
/usr/include/sys/mount.h:65: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:119: warning: `MS_MGC_VAL' redefined
/usr/include/sys/mount.h:70: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:127: warning: `S_APPEND' redefined
/usr/include/sys/mount.h:53: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:128: warning: `S_IMMUTABLE' redefined
/usr/include/sys/mount.h:55: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:164: warning: `BLKROSET' redefined
/usr/include/sys/mount.h:78: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:165: warning: `BLKROGET' redefined
/usr/include/sys/mount.h:79: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:166: warning: `BLKRRPART' redefined
/usr/include/sys/mount.h:80: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:167: warning: `BLKGETSIZE' redefined
/usr/include/sys/mount.h:81: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:168: warning: `BLKFLSBUF' redefined
/usr/include/sys/mount.h:82: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:169: warning: `BLKRASET' redefined
/usr/include/sys/mount.h:83: warning: this is the location of the previous 
definition
/usr/include/linux/fs.h:170: warning: `BLKRAGET' redefined
/usr/include/sys/mount.h:84: warning: this is the location of the previous 
definition
In file included from /usr/include/linux/fs.h:23,
                 from cmds.c:19:
/usr/include/linux/string.h:12: parse error before `__extension__'
/usr/include/linux/string.h:12: parse error before `&&'
/usr/include/linux/string.h:14: parse error before `__extension__'
/usr/include/linux/string.h:14: parse error before `('
/usr/include/linux/string.h:15: parse error before `__extension__'
/usr/include/linux/string.h:15: parse error before `&&'
In file included from /usr/include/linux/fs.h:23,
                 from cmds.c:19:
/usr/include/linux/string.h:24: parse error before `__extension__'
/usr/include/linux/string.h:27: parse error before `__extension__'
/usr/include/linux/string.h:33: parse error before `__extension__'
/usr/include/linux/string.h:36: parse error before `__extension__'
/usr/include/linux/string.h:36: parse error before `&&'
/usr/include/linux/string.h:36: warning: data definition has no type or 
storage class
/usr/include/linux/string.h:36: parse error before `}'
/usr/include/linux/string.h:36: conflicting declarations of `__result'
/usr/include/linux/string.h:36: `__result' previously declared here
etc.