LOCK Fixes/Break on FreeBSD 4.2-STABLE

The last batch of commits break on FreeBSD 4.2-STABLE.
$ uname -a
FreeBSD lerbsd.lerctr.org 4.2-STABLE FreeBSD 4.2-STABLE #90: Tue Nov
28 04:07:50 CST 2000
ler(at)lerbsd(dot)lerctr(dot)org:/usr/src/sys/compile/LERBSD i386
$

Configure:

./configure --prefix=/home/ler/pg-test --enable-syslog \
--with-CXX --with-perl --enable-multibyte --enable-cassert \
--with-openssl \
--with-includes="/usr/local/include/tcl8.3 /usr/local/include/tk8.3" \
--with-tcl \
--with-tclconfig=/usr/local/lib/tcl8.3 \
--with-tkconfig=/usr/local/lib/tk8.3

Last 50 lines of make output:

ranlib libplpgsql.a
/usr/libexec/elf/ld -x -shared -soname libplpgsql.so.1 -o libplpgsql.so.1 pl_parse.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o -R/home/ler/pg-test/lib
rm -f libplpgsql.so
ln -s libplpgsql.so.1 libplpgsql.so
gmake[4]: Leaving directory `/home/ler/pg-dev/pgsql/src/pl/plpgsql/src'
gmake[3]: Leaving directory `/home/ler/pg-dev/pgsql/src/pl/plpgsql'
gmake[3]: Entering directory `/home/ler/pg-dev/pgsql/src/pl/tcl'
/bin/sh mkMakefile.tcldefs.sh '/usr/local/lib/tcl8.3/tclConfig.sh' 'Makefile.tcldefs'
gmake[3]: Leaving directory `/home/ler/pg-dev/pgsql/src/pl/tcl'
gmake[3]: Entering directory `/home/ler/pg-dev/pgsql/src/pl/tcl'
cc -O -fPIC -I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3 -I../../../src/include -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DNEED_MATHERR=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -c -o pltcl.o pltcl.c
ld -Bshareable -x -o pltcl.so pltcl.o -L/usr/local/lib -ltcl83
rm pltcl.o
gmake[3]: Leaving directory `/home/ler/pg-dev/pgsql/src/pl/tcl'
gmake[3]: Entering directory `/home/ler/pg-dev/pgsql/src/pl/plperl'
plperl_installdir='/home/ler/pg-test/lib' \
EXTRA_INCLUDES='-I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3 -I../../../src/include' \
perl Makefile.PL
Writing Makefile for plperl
gmake -f Makefile all
gmake[4]: Entering directory `/home/ler/pg-dev/pgsql/src/pl/plperl'
mkdir blib
mkdir blib/lib
mkdir blib/arch
mkdir blib/arch/auto
mkdir blib/arch/auto/plperl
mkdir blib/lib/auto
mkdir blib/lib/auto/plperl
cc -c -I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3 -I../../../src/include -DVERSION=\"0.10\" -DXS_VERSION=\"0.10\" -DPIC -fpic -I/usr/libdata/perl/5.00503/mach/CORE plperl.c
In file included from plperl.c:80:
/usr/libdata/perl/5.00503/mach/CORE/perl.h:1483: warning: `DEBUG' redefined
../../../src/include/utils/elog.h:22: warning: this is the location of the previous definition
In file included from /usr/include/sys/lock.h:45,
from /usr/include/sys/mount.h:49,
from /usr/libdata/perl/5.00503/mach/CORE/perl.h:376,
from plperl.c:80:
/usr/include/machine/lock.h:148: conflicting types for `s_lock'
../../../src/include/storage/s_lock.h:402: previous declaration of `s_lock'
gmake[4]: *** [plperl.o] Error 1
gmake[4]: Leaving directory `/home/ler/pg-dev/pgsql/src/pl/plperl'
gmake[3]: *** [all] Error 2
gmake[3]: Leaving directory `/home/ler/pg-dev/pgsql/src/pl/plperl'
gmake[2]: *** [all] Error 2
gmake[2]: Leaving directory `/home/ler/pg-dev/pgsql/src/pl'
gmake[1]: *** [all] Error 2
gmake[1]: Leaving directory `/home/ler/pg-dev/pgsql/src'
gmake: *** [all] Error 2
$ ^D

Script done on Tue Nov 28 19:32:31 2000
BTW: this is the same configure I was using after Peter_E fixed the
TCL / --with-includes stuff.

--
Larry Rosenman http://www.lerctr.org/~ler
Phone: +1 972-414-9812 E-Mail: ler(at)lerctr(dot)org
US Mail: 1905 Steamboat Springs Drive, Garland, TX 75044-6749