]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
conf: Fix declaration of virNetworkDNS(Hosts)Def struct
authorMatthias Bolte <matthias.bolte@googlemail.com>
Mon, 4 Jul 2011 15:20:02 +0000 (17:20 +0200)
committerMatthias Bolte <matthias.bolte@googlemail.com>
Tue, 5 Jul 2011 08:40:27 +0000 (10:40 +0200)
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

index d7d2951997d3d295b5725f0a7c0776a4e2504bf7..5edcf27b175318bd9fb87dd0fc74b6d7ead9c960 100644 (file)
@@ -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;