Work on x86.
Merge branch 'master' of github.com:arthaud/moc
Make it compile.