Backport "inline" fix from VTK git repo

See http://review.source.kitware.com/#/c/12924/
Sync up with upstream vtk

This is a partial revert of 2799983edd37b813a7db2b235f3108ee64a051c5
(a Solaris 10 tweak)
and 04aacda4aa46eb275313b64a51e617587b8e6782 (an OS X tweak).

There is now only a single discrepancy with upstream.
More to ignore