Compile failure on -CURRENT

[walt]

Making: ../../unxfbsd.pro/obj/conditn.obj
cc -w -c -I. -I. -I../inc -I../../inc -I../../unx/inc -I../../unxfbsd.pro/inc -I. -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/sal/inc -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/vos/inc 
-I. -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solver/641/unxfbsd.pro/inc/dont_use_stl -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solver/641/unxfbsd.pro/inc/external 
-I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solver/641/unxfbsd.pro/inc -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solenv/unxfbsd/inc 
-I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solenv/inc -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/res 
-I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solver/641/unxfbsd.pro/inc/dont_use_stl -I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solenv/inc/Xp31 -I/usr/local/linux-sun-jdk1.3.1/include 
-I/usr/local/linux-sun-jdk1.3.1/include/linux -I/usr/local/linux-sun-jdk1.3.1/include/green_threads/include -I/usr/X11R6/include     -I. -I../../res -I. 
-I/usr/ports/editors/openoffice/work/oo_1.0.3_src/solenv/unxfbsdi/usr/include -I/usr/X11R6/include -O   -pipe -fPIC  -DFREEBSD -DUNX -DVCL -DGCC -DC300 -DINTEL -DCVER=C300 -D_USE_NAMESPACE 
-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=400 -DOSVERSION=500112 -D_THREAD_SAFE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DSUPD=641 -DBUILD=8584 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOPTIMIZE 
-DEXCEPTIONS_OFF -DCUI -DSOLAR_JAVA -DSRC641 -DBOOTSTRAPPER -DMULTITHREAD   -o ../../unxfbsd.pro/obj/conditn.o conditn.c
In file included from conditn.c:63:
system.h:580: conflicting types for `getpwent_r'
/usr/include/pwd.h:166: previous declaration of `getpwent_r'
dmake:  Error code 1, while making '../../unxfbsd.pro/obj/conditn.obj'

This definition:
work/oo_1.0.3_src/sal/osl/unx/system.h:struct passwd *getpwent_r(struct passwd *pwd, char *buffer,  int buflen);

conflicts with this definition from /usr/include/pwd.h:
#if __BSD_VISIBLE
int              getpwent_r(struct passwd *, char *, size_t, struct passwd **);
int              setpassent(int);
const char      *user_from_uid(uid_t, int);
#endif