diff options
| author | Adam Mitz <mitza@ociweb.com> | 2016-12-29 09:17:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 09:17:26 -0600 |
| commit | e4539b0fa9e54990df72a7e8218592eb9d067c4e (patch) | |
| tree | 929fd56b34ba24d357026b90c49234d16f6b435e | |
| parent | 80615174832f91c929c6f547a71aae43486b6948 (diff) | |
| parent | b6776aaddd00a2762419009a7705e6c11191ad18 (diff) | |
| download | ATCD-e4539b0fa9e54990df72a7e8218592eb9d067c4e.tar.gz | |
Merge pull request #342 from mitza-oci/master
Mac OS X configs: Updates to get ioctl(SIOCGIFCONF) to work on x86_64
| -rw-r--r-- | ACE/ace/config-macosx-leopard.h | 3 | ||||
| -rw-r--r-- | ACE/ace/config-macosx.h | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index 60fe9851162..09571443f0f 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -53,6 +53,7 @@ #define ACE_HAS_GPERF #define ACE_HAS_POSIX_SEM +#define ACE_HAS_SIOCGIFCONF #define ACE_HAS_SUNOS4_GETTIMEOFDAY @@ -229,6 +230,8 @@ // gperf seems to need this //#define ACE_HAS_NONSTATIC_OBJECT_MANAGER +#define ACE_IOCTL_TYPE_ARG2 unsigned long + #if defined(__APPLE_CC__) && (__APPLE_CC__ < 1173) #error "Compiler must be upgraded, see http://developer.apple.com" #endif /* __APPLE_CC__ */ diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index afd4819f518..f8e60226c4a 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -3,7 +3,7 @@ #include <Availability.h> #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 100900 -#include "ace/config-macosx-mavericks.h" +#include "config-macosx-mavericks.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100800 #include "config-macosx-mountainlion.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100700 @@ -13,11 +13,11 @@ #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100500 #include "config-macosx-leopard.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100400 -#include "config-macosx-tigher.h" +#include "config-macosx-tiger.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100300 -#include "config-macosx-pather.h" +#include "config-macosx-panther.h" #elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 100200 -#include "config-macosx.h" +#include "config-macosx-jaguar.h" #endif #endif // ACE_CONFIG_MACOSX_ALL_H |