Avoid symbol clash with win32 headers and node device APIs

ChangeLog

+Tue Nov 25 10:36:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/node_device_conf.c, src/node_device_conf.h,
+	src/node_device_devkit.c, src/node_device_hal.c: Change
+	'interface' to 'ifname' in struct to avoid clash with
+	symbols in MinGW/Win32 headers
+
 Tue Nov 25 11:29:19 +0100 2008 Jim Meyering <meyering@redhat.com>
 
 	* src/virterror.c (virReportErrorHelper): Sync doc to code.
@@ -6,20 +13,20 @@ Tue Nov 25 11:29:19 +0100 2008 Jim Meyering <meyering@redhat.com>
 	* src/libvirt.c (virStateActive, virStateCleanup, virStateReload):
 	(virStateActive): Add per-function comments.
 
-Mon Nov 24 19:32:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
+Mon Nov 24 19:32:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/openvz_conf.c, src/openvz_conf.h, src/openvz_driver.c:
 	Default vCPUs to equal host pCPU count if not set in config
 	(patch from Evgeniy Sokolov)
 
-Mon Nov 24 19:27:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
+Mon Nov 24 19:27:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* examples/domain-events/events-python/event-test.py,
 	python/libvir.c, python/libvir.py, python/libvirt_wrap.h,
 	python/types.c, python/virConnect.py: Fixes to python
 	bindings for changes in public event API (David Lively)
 
-Mon Nov 24 19:22:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
+Mon Nov 24 19:22:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* tests/Makefile.am, tests/sexpr2xmltest.c,
 	tests/testutilsxen.c, tests/xencapstest.c,
@@ -28,7 +35,7 @@ Mon Nov 24 19:22:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
 	WITH_XEN conditionals from source, since the entire build
 	is disabled in Makefile.am
 
-Mon Nov 24 16:49:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
+Mon Nov 24 16:49:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* autobuild.sh: Disable UML driver on mingw32 biuld
 

src/node_device_conf.c

@@ -269,7 +269,7 @@ char *virNodeDeviceDefFormat(virConnectPtr conn,
             break;
         case VIR_NODE_DEV_CAP_NET:
             virBufferVSprintf(&buf, "    <interface>%s</interface>\n",
-                              data->net.interface);
+                              data->net.ifname);
             if (data->net.address)
                 virBufferVSprintf(&buf, "    <address>%s</address>\n",
                                   data->net.address);
@@ -374,7 +374,7 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps)
         VIR_FREE(data->usb_if.description);
         break;
     case VIR_NODE_DEV_CAP_NET:
-        VIR_FREE(data->net.interface);
+        VIR_FREE(data->net.ifname);
         VIR_FREE(data->net.address);
         break;
     case VIR_NODE_DEV_CAP_SCSI_HOST:

src/node_device_conf.h

@@ -102,7 +102,7 @@ struct _virNodeDevCapsDef {
         } usb_if;
         struct {
             char *address;
-            char *interface;
+            char *ifname;
             enum virNodeDevNetCapType subtype;  /* LAST -> no subtype */
         } net;
         struct {

src/node_device_devkit.c

@@ -118,14 +118,14 @@ static int gather_net_cap(DevkitDevice *dkdev,
                           union _virNodeDevCapData *d)
 {
     const char *sysfs_path = devkit_device_get_native_path(dkdev);
-    const char *interface;
+    const char *ifname;
 
     if (sysfs_path == NULL)
         return -1;
-    interface = strrchr(sysfs_path, '/');
-    if (!interface || !*interface || !*(++interface))
+    ifname = strrchr(sysfs_path, '/');
+    if (!ifname || !*ifname || !*(++ifname))
         return -1;
-    if ((d->net.interface = strdup(interface)) == NULL)
+    if ((d->net.ifname = strdup(ifname)) == NULL)
         return -1;
 
     d->net.subtype = VIR_NODE_DEV_CAP_NET_LAST;

src/node_device_hal.c

@@ -196,7 +196,7 @@ static int gather_net_cap(LibHalContext *ctx, const char *udi,
                           union _virNodeDevCapData *d)
 {
     unsigned long long dummy;
-    (void)get_str_prop(ctx, udi, "net.interface", &d->net.interface);
+    (void)get_str_prop(ctx, udi, "net.interface", &d->net.ifname);
     (void)get_str_prop(ctx, udi, "net.address", &d->net.address);
     if (get_uint64_prop(ctx, udi, "net.80203.mac_address",
                         &dummy) == 0)