解决编译问题
更新编辑脚步
Merge commit 'refs/top-bases/t/3rdTools/curl' into t/3rdTools/curl