Fix building on vxworks
Merge