]> xenbits.xensource.com Git - libvirt.git/commitdiff
src: conditionalize EAI_ADDRFAMILY
authorDaniel P. Berrangé <berrange@redhat.com>
Thu, 23 Jan 2020 11:40:39 +0000 (11:40 +0000)
committerDaniel P. Berrangé <berrange@redhat.com>
Wed, 29 Jan 2020 14:51:40 +0000 (14:51 +0000)
The EAI_ADDRFAMILY constant has been removed from FreeBSD
headers, supposedly because it is deprecated by new RFC
drafts.

Previously GNULIB was providing a replacement because
MinGW lacked it too. The replacement provided for MinGW
was thus being used on FreeBSD too, but with a completely
bogus integer value.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/rpc/virnetsocket.c

index b0af7d4dfa70ed404af965fa1e639566274b5e8a..be9ac9aeeda971cfa7ae3f87a7f039026ae86844 100644 (file)
@@ -178,8 +178,10 @@ int virNetSocketCheckProtocols(bool *hasIPv4,
     hints.ai_socktype = SOCK_STREAM;
 
     if ((gaierr = getaddrinfo("::1", NULL, &hints, &ai)) != 0) {
-        if (gaierr == EAI_ADDRFAMILY ||
-            gaierr == EAI_FAMILY ||
+        if (gaierr == EAI_FAMILY ||
+# ifdef EAI_ADDRFAMILY
+            gaierr == EAI_ADDRFAMILY ||
+# endif
             gaierr == EAI_NONAME) {
             *hasIPv6 = false;
         } else {