Make build compile error

[Rodney Hopkins <rhopkins@sunflower.com>]

I've just upgraded my box from 3.0-stable to 3.1.  I'm attempting to go to 
3.1 stable but having a bit of a difficult time.

I downloaded the release (not the current) srcsys.tar.gz and src.tar.gz and 
extracted them into /usr/src.

I then did a cvs -d $CVSROOT -q up -rOPENBSD_3_1 -Pd from /usr/src to bring 
my source code up to -stable.

I then proceeded to attempt to compile.  I started with a new kernel and 
that compiled fine.  I installed it and rebooted.  I am now trying to do a 
make build (after doing make obj, of course) and my build keeps dying here:

cc -O2   -Werror -DLIBC_SCCS -DSYSLIBC_SCCS -I/usr/src/lib/libc/include 
-DYP -I/usr/src/lib/libc/yp -D__DBINTERFACE_PRIVATE -DRESOLVSORT 
-DPOSIX_MISTAKE -DFLOATING_POINT -DNLS   -c 
/usr/src/lib/libc/db/btree/bt_close.c -o bt_close.o
In file included from /usr/src/lib/libc/db/btree/bt_close.c:56:
/usr/src/lib/libc/db/btree/btree.h:210: syntax error before `ichar'
*** Error code 1

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

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

Stop in /usr/src (line 75 of Makefile).


I've looked at both bt_close and btree.h and I don't see any totally 
obvious syntax error.

If it makes any difference, my CVSROOT variable was set to 
anoncvs@anoncvs6.usa.openbsd.org:/cvs  I also tried with 
anoncvs3.usa.openbsd.org and got the same results.

Has anyone else seen this or perhaps have some advice as to how I might fix 
this or get around it?

Thanks!

Rodney Hopkins
rhopkins@sunflower.com