diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-30 13:16:03 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-05-30 13:16:03 +0000 |
| commit | 849fbf1f25a77db253eb85cf83fe2562ff1f4ab9 (patch) | |
| tree | cd51674e7aed6305788afae65677d7bfa5a51ba4 | |
| parent | 48992b82480bd26ba93306e0f1b152e2da6d7dc0 (diff) | |
| download | ATCD-849fbf1f25a77db253eb85cf83fe2562ff1f4ab9.tar.gz | |
ChangeLogTag: Fri May 30 13:17:55 UTC 2008 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/tests/INET_Addr_Test_IPV6.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8c9ca517d48..6c3e8a71cc1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri May 30 13:17:55 UTC 2008 Simon Massey <sma@prismtech.com> + + * test/INET_Addr_Test_IPV6.cpp: + Resolve Conflict #define INTERFACE with MFC under VC8. + Fri May 30 10:07:55 UTC 2008 Vladimir Zykov <vzykov@prismtech.com> * ace/config-win32-borland.h: diff --git a/ACE/tests/INET_Addr_Test_IPV6.cpp b/ACE/tests/INET_Addr_Test_IPV6.cpp index 134119ae7b9..0290edfd837 100644 --- a/ACE/tests/INET_Addr_Test_IPV6.cpp +++ b/ACE/tests/INET_Addr_Test_IPV6.cpp @@ -20,7 +20,7 @@ #include "ace/OS_NS_arpa_inet.h" #define LINK_LOCAL_ADDR ACE_TEXT ("fe80::") -#define INTERFACE ("eth0") +#define THE_INTERFACE ("eth0") // Make sure that ACE_Addr::addr_type_ is the same // as the family of the inet_addr_. @@ -149,7 +149,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) status = 1; } - if (-1 == link_local_addr.set_interface (INTERFACE)) + if (-1 == link_local_addr.set_interface (THE_INTERFACE)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), |