From cf5c288dda778a2d1ab1a6a55cc74d635530bd4d Mon Sep 17 00:00:00 2001
From: Joe Eli McIlvain <joe.eli.mac@gmail.com>
Date: Fri, 29 Jan 2016 19:50:04 -0800
Subject: [PATCH] Rename `udp_address::interface` to `iface` for VS2015 build.
 Resolves #1739.

---
 src/udp_address.cpp | 6 +++---
 src/udp_address.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/udp_address.cpp b/src/udp_address.cpp
index cfa48e45..5870fc69 100644
--- a/src/udp_address.cpp
+++ b/src/udp_address.cpp
@@ -100,8 +100,8 @@ int zmq::udp_address_t::resolve (const char *name_)
     else
         is_mutlicast = false;
 
-    interface.s_addr = htons (INADDR_ANY);
-    if (interface.s_addr == INADDR_NONE) {
+    iface.s_addr = htons (INADDR_ANY);
+    if (iface.s_addr == INADDR_NONE) {
         errno = EINVAL;
         return -1;
     }
@@ -153,7 +153,7 @@ const in_addr zmq::udp_address_t::multicast_ip () const
 
 const in_addr zmq::udp_address_t::interface_ip () const
 {
-    return interface;
+    return iface;
 }
 
 #if defined ZMQ_HAVE_WINDOWS
diff --git a/src/udp_address.hpp b/src/udp_address.hpp
index 676bc645..1b4a90b1 100644
--- a/src/udp_address.hpp
+++ b/src/udp_address.hpp
@@ -73,7 +73,7 @@ namespace zmq
     private:
 
         in_addr  multicast;
-        in_addr  interface;
+        in_addr  iface;
         sockaddr_in bind_address;
         sockaddr_in dest_address;
         bool is_mutlicast;