Re: LOCK Fixes/Break on FreeBSD 4.2-STABLE

Larry Rosenman <ler@lerctr.org> writes:
> The last batch of commits break on FreeBSD 4.2-STABLE. 
> /usr/include/machine/lock.h:148: conflicting types for `s_lock'
> ../../../src/include/storage/s_lock.h:402: previous declaration of `s_lock'

That's odd.  s_lock has been declared the same way right along in our
code; I didn't change it.  Can you see what's changed to cause a
conflict where there was none before?
        regards, tom lane