Rename C types so that hippy+pypy sockets co-exist.

PHP sha.h and OpenSSL sha.h had name clashes.
fix the deps
Merge branch 'master' into pypy_bridge
Put back a @jit.unroll_safe.

Without this we have no cross-language tracing.