Buildworld Fails RELENG_7

[Dave Uhring]

Sources checked out yesterday, updated this morning using cvsup and
repository at cvsup12.freebsd.org.  The build fails in /usr/src/lib/libc

/usr/bin/gcc -O2 -fno-strict-aliasing -pipe -m32 -march=athlon-mp -I/usr/src/lib/libc/include -I/usr/src/lib/libc/../../include -I/usr/src/lib/libc/i386 -D__DBINTERFACE_PRIVATE -I/usr/src/lib/libc/../../contrib/gdtoa -DINET6 -I/usr/obj/usr/src/lib/libc -I/usr/src/lib/libc/resolv -DPOSIX_MISTAKE -I/usr/src/lib/libc/locale -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -I/usr/src/lib/libc/rpc -DYP -DNS_CACHING -DSYMBOL_VERSIONING -Wsystem-headers -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -c /usr/src/lib/libc/sys/fcntl.c
/usr/src/lib/libc/sys/fcntl.c: In function 'fcntl':
/usr/src/lib/libc/sys/fcntl.c:42: error: storage size of 'ofl' isn't known
/usr/src/lib/libc/sys/fcntl.c:67: error: 'F_OGETLK' undeclared (first use in this function)
/usr/src/lib/libc/sys/fcntl.c:67: error: (Each undeclared identifier is reported only once
/usr/src/lib/libc/sys/fcntl.c:67: error: for each function it appears in.)
/usr/src/lib/libc/sys/fcntl.c:74: error: 'struct flock' has no member named 'l_sysid'
/usr/src/lib/libc/sys/fcntl.c:79: error: 'F_OSETLK' undeclared (first use in this function)
/usr/src/lib/libc/sys/fcntl.c:82: error: 'F_OSETLKW' undeclared (first use in this function)
/usr/src/lib/libc/sys/fcntl.c:42: warning: unused variable 'ofl'
*** Error code 1

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