diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-02-11 09:40:17 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-02-11 09:40:17 +0000 |
| commit | aac4344cd6c9f1e0c427268d3255cba141469ce6 (patch) | |
| tree | 1d43932e73632a7e2467c114bd828f9b260ba81d /ACE | |
| parent | 24c837d835915ff75ac53c8af22b0f4415a1d82f (diff) | |
| download | ATCD-aac4344cd6c9f1e0c427268d3255cba141469ce6.tar.gz | |
Tue Feb 11 09:41:16 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-macosx-mavericks.h:
* ace/config-macosx-mountainlion.h:
Moved some defines for disabling deprecated functions to the
mountainlion file
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-mavericks.h | 11 | ||||
| -rw-r--r-- | ACE/ace/config-macosx-mountainlion.h | 10 |
3 files changed, 17 insertions, 11 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2787b528182..24dc5d81453 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 11 09:41:16 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-macosx-mavericks.h: + * ace/config-macosx-mountainlion.h: + Moved some defines for disabling deprecated functions to the + mountainlion file + Mon Feb 10 09:19:57 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * docs/Download.html: diff --git a/ACE/ace/config-macosx-mavericks.h b/ACE/ace/config-macosx-mavericks.h index 44409d8fbf3..6e2f2988c07 100644 --- a/ACE/ace/config-macosx-mavericks.h +++ b/ACE/ace/config-macosx-mavericks.h @@ -2,23 +2,12 @@ #ifndef ACE_CONFIG_MACOSX_MAVERICKS_H #define ACE_CONFIG_MACOSX_MAVERICKS_H - // Mac OS X has broken symbol visibility. Unless we're told otherwise, // disable it by default. #ifndef ACE_HAS_CUSTOM_EXPORT_MACROS #define ACE_HAS_CUSTOM_EXPORT_MACROS 0 #endif -// Deprecated in Mavericks -#ifndef ACE_LACKS_SBRK -#define ACE_LACKS_SBRK -#endif - -// Deprecated in Mavericks -#ifndef ACE_LACKS_TEMPNAM -#define ACE_LACKS_TEMPNAM -#endif - #ifndef ACE_HAS_SSIZE_T #define ACE_HAS_SSIZE_T #endif diff --git a/ACE/ace/config-macosx-mountainlion.h b/ACE/ace/config-macosx-mountainlion.h index c8f6a08fbc5..75005bd133c 100644 --- a/ACE/ace/config-macosx-mountainlion.h +++ b/ACE/ace/config-macosx-mountainlion.h @@ -2,6 +2,16 @@ #ifndef ACE_CONFIG_MACOSX_MOUNTAINLION_H #define ACE_CONFIG_MACOSX_MOUNTAINLION_H +// Deprecated +#ifndef ACE_LACKS_SBRK +#define ACE_LACKS_SBRK +#endif + +// Deprecated +#ifndef ACE_LACKS_TEMPNAM +#define ACE_LACKS_TEMPNAM +#endif + #include "ace/config-macosx-lion.h" #endif // ACE_CONFIG_MACOSX_MOUNTAIN_LION_H |