Merge branch 'polarssl-1.2' into polarssl-1.2-restricted

* polarssl-1.2:
  Fix spurious #endif from previous cherry-pick
  Fix macroization of inline in C++
  Add missing warning in doc
  Fix compile error in net.c with musl libc