git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'

Some more 2.12.2 testing on Solaris 11.3 x86_64:

$ make V=1
gcc -o credential-store.o -c -MF ./.depend/credential-store.o.d -MQ
credential-store.o -MMD -MP -I/usr/local/include -m64 -m64 -I.
-D__EXTENSIONS__ -D__sun__ -DUSE_LIBPCRE -I/usr/local/include
-DHAVE_ALLOCA_H -I/usr/local/include -DUSE_CURL_FOR_IMAP_SEND
-I/usr/local/include -I/usr/local/include -DNO_D_TYPE_IN_DIRENT
-DNO_INET_NTOP -DNO_INET_PTON  -DHAVE_PATHS_H -DHAVE_LIBCHARSET_H
-DHAVE_STRINGS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME
-DHAVE_CLOCK_MONOTONIC -DHAVE_GETDELIM -DSHA1_HEADER='<openssl/sha.h>'
 -Icompat/regex -DSHELL_PATH='"/bin/bash"' -DPAGER_ENV='"LESS=FRX
LV=-c"'  credential-store.c
In file included from cache.h:4:0,
                 from credential-store.c:1:
git-compat-util.h:735:13: error: conflicting types for 'inet_ntop'
 const char *inet_ntop(int af, const void *src, char *dst, size_t size);
             ^
In file included from git-compat-util.h:209:0,
                 from cache.h:4,
                 from credential-store.c:1:
/usr/include/arpa/inet.h:43:20: note: previous declaration of
'inet_ntop' was here
 extern const char *inet_ntop(int, const void *_RESTRICT_KYWD,
                    ^
make: *** [credential-store.o] Error 1

Looking at git-compat-util.h around line 730:

#ifdef NO_INET_PTON int inet_pton(int af, const char *src, void *dst); #endif

#ifdef NO_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif

When I grep config.log, I don't see a test that results in NO_INET_*:

    $ grep NO_INET config.log
    $

According to Solaris' man page for inet_ntop:

inet(3SOCKET)              Sockets Library Functions             inet(3SOCKET)

NAME
       inet,  inet6, inet_ntop, inet_pton, inet_aton, inet_addr, inet_network,
       inet_makeaddr, inet_lnaof, inet_netof,  inet_ntoa  -  Internet  address
       manipulation

SYNOPSIS
       cc [ flag... ] file... -lsocket  -lnsl  [ library... ]
       #include <sys/socket.h>
       #include <netinet/in.h>
       #include <arpa/inet.h>

       const char *inet_ntop(int af, const void *addr, char *cp,
            socklen_t size);

       int inet_pton(int af, const char *cp, void *addr);

       int inet_aton(const char *cp, struct in_addr *addr);

       in_addr_t inet_addr(const char *cp);

       in_addr_t inet_network(const char *cp);
       ...

Jeff