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