Avoid hiding strlen function needed by strcmp
Merge pull request #1177 from yurchor/master

Avoid hiding strlen function needed by strcmp