Buildworld failure with 1.3.6 devel today

[Michael Ray]

cc -O -pipe -mtune=pentiumpro -DLIBC_RCS -DSYSLIBC_RCS
-I/usr/src/lib/libc/include -DI18NMODULE_MAJOR=1 -D_I18N_DYNAMIC
-D__DBINTERFACE_PRIVATE -I/usr/src/lib/libc/../libc/locale -DINET6
-DPOSIX_MISTAKE -I/usr/src/lib/libc/../libc/locale -DBROKEN_DES -DYP
-Wunknown-pragmas -Wsystem-headers -Wall -W -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual
-Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wchar-subscripts
-Winline -Wnested-externs -Wredundant-decls  -c
/usr/src/lib/libc/../libc/string/strerror.c -o strerror.o
/usr/src/lib/libc/../libc/string/strerror.c: In function `strerror':
/usr/src/lib/libc/../libc/string/strerror.c:92: warning: cast discards
qualifiers from pointer target type
cc -O -pipe -mtune=pentiumpro -DLIBC_RCS -DSYSLIBC_RCS
-I/usr/src/lib/libc/include -DI18NMODULE_MAJOR=1 -D_I18N_DYNAMIC
-D__DBINTERFACE_PRIVATE -I/usr/src/lib/libc/../libc/locale -DINET6
-DPOSIX_MISTAKE -I/usr/src/lib/libc/../libc/locale -DBROKEN_DES -DYP
-Wunknown-pragmas -Wsystem-headers -Wall -W -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual
-Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wchar-subscripts
-Winline -Wnested-externs -Wredundant-decls  -c
/usr/src/lib/libc/../libc/string/strlcat.c -o strlcat.o
cc -O -pipe -mtune=pentiumpro -DLIBC_RCS -DSYSLIBC_RCS
-I/usr/src/lib/libc/include -DI18NMODULE_MAJOR=1 -D_I18N_DYNAMIC
-D__DBINTERFACE_PRIVATE -I/usr/src/lib/libc/../libc/locale -DINET6
-DPOSIX_MISTAKE -I/usr/src/lib/libc/../libc/locale -DBROKEN_DES -DYP
-Wunknown-pragmas -Wsystem-headers -Wall -W -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual
-Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wchar-subscripts
-Winline -Wnested-externs -Wredundant-decls  -c
/usr/src/lib/libc/../libc/string/strlcpy.c -o strlcpy.o
cc -O -pipe -mtune=pentiumpro -DLIBC_RCS -DSYSLIBC_RCS
-I/usr/src/lib/libc/include -DI18NMODULE_MAJOR=1 -D_I18N_DYNAMIC
-D__DBINTERFACE_PRIVATE -I/usr/src/lib/libc/../libc/locale -DINET6
-DPOSIX_MISTAKE -I/usr/src/lib/libc/../libc/locale -DBROKEN_DES -DYP
-Wunknown-pragmas -Wsystem-headers -Wall -W -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual
-Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wchar-subscripts
-Winline -Wnested-externs -Wredundant-decls  -c
/usr/src/lib/libc/../libc/string/strmode.c -o strmode.o
/usr/src/lib/libc/../libc/string/strmode.c:44: error: conflicting
types for 'strmode'
/usr/obj/usr/src/world_i386/usr/include/string.h:95: error: previous
declaration of 'strmode' was here
/usr/src/lib/libc/../libc/string/strmode.c:44: error: conflicting
types for 'strmode'
/usr/obj/usr/src/world_i386/usr/include/string.h:95: error: previous
declaration of 'strmode' was here
*** Error code 1

Stop in /usr/src/lib/libc.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.