Made code more portable.
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core