Brlcad fixes for current HEAD

I had to make these changes to get the current HEAD of BRL-CAD to compile.  BRL-CAD is experimenting with libavoid and will eventually integrate it into its package.  BRL-CAD is at <http://brlcad.org>.