Renaming that only papers over the issue, unfortunately. In the interest of getting this into the 1.9.3 release which I really want to get out in a couple of days, let's not worry about this too much for the moment.

The proper solution -- and I suspect that something like that will have to happen when you send this upstream (you want to do that, yes?) -- would be to move the resolve_symlink() definition into another file and calling `#undef resolve_symlink` in said file. I know, it will result in dead code, but it will *also* result in less of a deviation of the Windows port of Git from upstream.