Various fixes for dtrace builds on FreeBSD and for other platforms
authorTony Cook <tony@develop-help.com>
Wed, 4 Jan 2017 23:39:44 +0000 (10:39 +1100)
committerTony Cook <tony@develop-help.com>
Wed, 4 Jan 2017 23:39:44 +0000 (10:39 +1100)
(to a lesser extent)


Trivial merge