am b1b53177: Merge "sysconf.c was renamed to sysconf.cpp (and modified)..."

* commit 'b1b5317799a34ac9e93f568af82952e52a9e9a13':
  sysconf.c was renamed to sysconf.cpp (and modified)...