diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2010-01-26 04:37:43 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2010-01-26 04:37:43 +0000 |
| commit | 431d4ae4bc491ec026a8ca9cf77f873bacc213cd (patch) | |
| tree | 72b5062172992e8e58fdfff8065b4f9b24b4b7bc | |
| parent | ae529140c748af6e436bc31371a9bf61404a18a6 (diff) | |
| download | ATCD-431d4ae4bc491ec026a8ca9cf77f873bacc213cd.tar.gz | |
Tue Jan 26 04:35:17 UTC 2010 Abdul Sowayan <sowayan@gmail.com>
| -rw-r--r-- | ACE/ChangeLog | 16 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_netdb.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-leopard.h | 2 | ||||
| -rw-r--r-- | ACE/ace/os_include/net/os_if.h | 4 |
4 files changed, 19 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 56e6ebc51a5..138606acec3 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,16 +1,28 @@ +Tue Jan 26 04:35:17 UTC 2010 Abdul Sowayan <sowayan@gmail.com> + + * ace/config-macosx-leopard.h: + + Added ACE_HAS_MAC_OSX macro. + + * ace/OS_NS_netdb.cpp: + * ace/os_include/net/os_if.h: + + Enabled ACE_OS::getmacaddress() for Mac OSX as well. + It uses exactly the same code as the iPhone's addition below. + Tue Jan 26 04:18:54 UTC 2010 Abdul Sowayan <sowayan@gmail.com> * ace/OS_NS_netdb.cpp: Implement ACE_OS::getmacaddress() for iPhone. The same implementation - will probably work on Mac OS X as well. I will verify this in the + will probably work on Mac OS X as well. I will verify this in the future. * ace/os_include/net/os_if.h: Added "#include <net/if_dl.h>" to this file if ACE_HAS_IPHONE is defined. The ACE_OS::getmacaddress() depends on this include - include file. + include file. Mon Jan 25 18:58:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp index 82b6ad6376d..345162a4a3c 100644 --- a/ACE/ace/OS_NS_netdb.cpp +++ b/ACE/ace/OS_NS_netdb.cpp @@ -385,7 +385,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node) return 0; -#elif defined (ACE_HAS_IPHONE) +#elif defined (ACE_HAS_IPHONE) || defined (ACE_HAS_MAC_OSX) const long BUFFERSIZE = 4000; char buffer[BUFFERSIZE]; diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index 8c82e559e63..0ec5f6a0fd9 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -6,6 +6,8 @@ #ifndef ACE_CONFIG_MACOSX_LEOPARD_H #define ACE_CONFIG_MACOSX_LEOPARD_H +#define ACE_HAS_MAC_OSX + #if ! defined (__ACE_INLINE__) #define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index a98ab79407e..4b2927eec63 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -26,9 +26,9 @@ #if !defined (ACE_LACKS_NET_IF_H) # include /**/ <net/if.h> -# if defined (ACE_HAS_IPHONE) +# if defined (ACE_HAS_IPHONE) || defined (ACE_HAS_MAC_OSX) # include /**/ <net/if_dl.h> -# endif /* ACE_HAS_IPHONE */ +# endif /* ACE_HAS_IPHONE || ACE_HAS_MAC_OSX */ # if defined (HPUX) && defined (IOR) /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h and we don't want that definition. See IOP_IORC.h. |