7dba0d668f
Make changes equivalent to those originally made by commits bd56626a (Fixes for the OSF operating system build, 2010-09-08) 92c082b1 (Add a fix for the inline keyword on the osf os, 2010-09-10) but based on the updated libarchive snapshot.