diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2010-01-26 12:55:03 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2010-01-26 12:55:03 +0000 |
| commit | 3b385c1188c658a4e00dd60af782e51cec1bcab6 (patch) | |
| tree | 0d96ccf99536c6fe4f2418ab827204f7f795f9ca | |
| parent | cfeaac9a71df5e9275f491fe26f6b67cb1fa3358 (diff) | |
| download | ATCD-3b385c1188c658a4e00dd60af782e51cec1bcab6.tar.gz | |
Tue Jan 26 12:52:57 UTC 2010 Abdul Sowayan <sowayan@gmail.com>
| -rw-r--r-- | ACE/ChangeLog | 12 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-leopard.h | 1 | ||||
| -rw-r--r-- | ACE/ace/os_include/net/os_if.h | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 138606acec3..17476e909e7 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,15 @@ +Tue Jan 26 12:52:57 UTC 2010 Abdul Sowayan <sowayan@gmail.com> + + * ace/config-macosx-leopard.h: + + Added ACE_HAS_NET_IF_DL_H macro. + + * ace/os_include/net/os_if.h: + + Removed hardcoding of ACE_HAS_IPHONE and ACE_HAS_MAC_OSX + checks. If the platform defines ACE_HAS_NET_IF_DL_H macro, + then <net/if_dl.h> will be included. + Tue Jan 26 04:35:17 UTC 2010 Abdul Sowayan <sowayan@gmail.com> * ace/config-macosx-leopard.h: diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index 0ec5f6a0fd9..54149d39421 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -7,6 +7,7 @@ #define ACE_CONFIG_MACOSX_LEOPARD_H #define ACE_HAS_MAC_OSX +#define ACE_HAS_NET_IF_DL_H #if ! defined (__ACE_INLINE__) #define __ACE_INLINE__ diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index 4b2927eec63..43ee7bff76c 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) || defined (ACE_HAS_MAC_OSX) +# if defined (ACE_HAS_NET_IF_DL_H) # include /**/ <net/if_dl.h> -# endif /* ACE_HAS_IPHONE || ACE_HAS_MAC_OSX */ +# endif /* ACE_HAS_NET_IF_DL_H */ # 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. |