Original commit message from CVS: Make these compile with both solaris as well as lunix-based stuffies