Merge branch 'rj/msvc-build'

* rj/msvc-build:
msvc: avoid collisions between "tags" and "TAGS"
msvc: test-svn-fe: Fix linker "unresolved external" error
msvc: Fix build by adding missing symbol defines
msvc: git-daemon: Fix linker "unresolved external" errors
msvc: Fix compilation errors caused by poll.h emulation

diff --combined config.mak.uname
index e09af8fc13ec4c3c6fa326e8208c98be52347a10,bb8246b63e48a96dca4f37ff9e12b2f6f44763a6..9080054f7617017a67ca0ae8414f829a01d3d546
--- 1/config.mak.uname
--- 2/config.mak.uname
+++ b/config.mak.uname
@@@ -321,12 -321,12 +321,11 @@@ ifeq ($(uname_S),Windows
        NO_UNSETENV = YesPlease
        NO_STRCASESTR = YesPlease
        NO_STRLCPY = YesPlease
 -      NO_STRTOK_R = YesPlease
        NO_FNMATCH = YesPlease
        NO_MEMMEM = YesPlease
        # NEEDS_LIBICONV = YesPlease
        NO_ICONV = YesPlease
        NO_STRTOUMAX = YesPlease
-       NO_STRTOULL = YesPlease
        NO_MKDTEMP = YesPlease
        NO_MKSTEMPS = YesPlease
        SNPRINTF_RETURNS_BOGUS = YesPlease
@@@ -343,6 -343,9 +342,9 @@@
        NO_CURL = YesPlease
        NO_PYTHON = YesPlease
        BLK_SHA1 = YesPlease
+       ETAGS_TARGET = ETAGS
+       NO_INET_PTON = YesPlease
+       NO_INET_NTOP = YesPlease
        NO_POSIX_GOODIES = UnfortunatelyYes
        NATIVE_CRLF = YesPlease
        DEFAULT_HELP_FORMAT = html
@@@ -475,6 -478,7 +477,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
        NO_UNSETENV = YesPlease
        NO_STRCASESTR = YesPlease
        NO_STRLCPY = YesPlease
 -      NO_STRTOK_R = YesPlease
        NO_FNMATCH = YesPlease
        NO_MEMMEM = YesPlease
        NEEDS_LIBICONV = YesPlease

diff --combined git-compat-util.h
index e715285e7c2e0a3d0b959505921b344dda55089d,490afb6af457430ec28e3d70050ff12787f6cd7d..90e037203879f6ba91403ae5371f18910206b580
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
@@@ -86,6 -86,9 +86,9 @@@
  #define _SGI_SOURCE 1
  
  #ifdef WIN32 /* Both MinGW and MSVC */
+ # if defined (_MSC_VER)
+ #  define _WIN32_WINNT 0x0502
+ # endif
  #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
  #include <winsock2.h>
  #include <windows.h>
@@@ -213,17 -216,6 +216,17 @@@ extern char *gitbasename(char *)
  #include <openssl/err.h>
  #endif
  
 +/* On most systems <netdb.h> would have given us this, but
 + * not on some systems (e.g. z/OS).
 + */
 +#ifndef NI_MAXHOST
 +#define NI_MAXHOST 1025
 +#endif
 +
 +#ifndef NI_MAXSERV
 +#define NI_MAXSERV 32
 +#endif
 +
  /* On most systems <limits.h> would have given us this, but
   * not on some systems (e.g. GNU/Hurd).
   */
@@@ -432,6 -424,11 +435,6 @@@ extern uintmax_t gitstrtoumax(const cha
  extern intmax_t gitstrtoimax(const char *, char **, int);
  #endif
  
 -#ifdef NO_STRTOK_R
 -#define strtok_r gitstrtok_r
 -extern char *gitstrtok_r(char *s, const char *delim, char **save_ptr);
 -#endif
 -
  #ifdef NO_HSTRERROR
  #define hstrerror githstrerror
  extern const char *githstrerror(int herror);