From 4a6d4d42854d6ddfe5498dbf4008b7db86fd1181 Mon Sep 17 00:00:00 2001 From: Matthias Bolte Date: Mon, 4 Jul 2011 17:20:02 +0200 Subject: [PATCH] conf: Fix declaration of virNetworkDNS(Hosts)Def struct The struct A {} A; construct triggers a linker error on OSX about duplicate symbols. This also differs from the common struct style. Switch to common style to fix this. Reported by Justin Clift. --- src/conf/network_conf.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index d7d2951997..5edcf27b17 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -64,22 +64,22 @@ struct _virNetworkDNSTxtRecordsDef { char *value; }; -struct virNetworkDNSHostsDef { +struct _virNetworkDNSHostsDef { virSocketAddr ip; int nnames; char **names; -} virNetworkDNSHostsDef; +}; -typedef struct virNetworkDNSHostsDef *virNetworkDNSHostsDefPtr; +typedef struct _virNetworkDNSHostsDef *virNetworkDNSHostsDefPtr; -struct virNetworkDNSDef { +struct _virNetworkDNSDef { unsigned int ntxtrecords; virNetworkDNSTxtRecordsDefPtr txtrecords; unsigned int nhosts; virNetworkDNSHostsDefPtr hosts; -} virNetworkDNSDef; +}; -typedef struct virNetworkDNSDef *virNetworkDNSDefPtr; +typedef struct _virNetworkDNSDef *virNetworkDNSDefPtr; typedef struct _virNetworkIpDef virNetworkIpDef; typedef virNetworkIpDef *virNetworkIpDefPtr;