diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-17 19:31:58 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-17 19:31:58 +0000 |
| commit | fb987e6cdba67347784ab5c86072523e367834aa (patch) | |
| tree | df674e24d20dfc2406478cefa32563b0932271cb /ace | |
| parent | ebb2011f7fdcc3d2338a9f4730c90f238f3e68ad (diff) | |
| download | ATCD-fb987e6cdba67347784ab5c86072523e367834aa.tar.gz | |
ChangeLogTag: Thu Oct 17 19:18:02 UTC 2002 Craig Rodrigues <crodrigu@bbn.com>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Log_Msg.cpp | 4 | ||||
| -rw-r--r-- | ace/OS.h | 4 | ||||
| -rw-r--r-- | ace/config-macosx.h | 25 |
3 files changed, 17 insertions, 16 deletions
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index a6d833432bf..f3893bd7dad 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -902,13 +902,13 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #if ! (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) \ && !defined(__MINGW32__) -#if defined (__FreeBSD__) || defined(__QNX__) +#if defined (__FreeBSD__) || defined(__QNX__) || defined(__APPLE__) extern const int sys_nerr; #elif defined (__CYGWIN32__) # define sys_nerr _sys_nerr #else extern int sys_nerr; -#endif /* !__FreeBSD__ && !__QNX__ */ +#endif /* !__FreeBSD__ && !__QNX__ && !__APPLE__ */ #endif /* ! (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */ typedef void (*PTF)(...); @@ -3303,9 +3303,7 @@ extern "C" // No reason to #include this if the platform lacks support for SHMEM # include /**/ <sys/shm.h> # endif /* ACE_LACKS_SYSV_SHMEM */ -# if ! defined (__MACOSX__) -# include /**/ <sys/sem.h> -# endif /* ! defined (__MACOSX__) */ +# include /**/ <sys/sem.h> # include /**/ <sys/file.h> # include /**/ <sys/time.h> # include /**/ <sys/resource.h> diff --git a/ace/config-macosx.h b/ace/config-macosx.h index c14bb1105b9..a983d5931da 100644 --- a/ace/config-macosx.h +++ b/ace/config-macosx.h @@ -3,8 +3,8 @@ // This configuration file is designed to work with the MacOS X operating system. -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H +#ifndef ACE_CONFIG_MACOSX_H +#define ACE_CONFIG_MACOSX_H #if ! defined (__ACE_INLINE__) #define __ACE_INLINE__ @@ -22,11 +22,6 @@ # undef ACE_HAS_PENTIUM #endif /* ACE_HAS_PENTIUM */ -// Platform specific directives - -#define __MACOSX__ -#define ACE_HAS_MACOSX_DYLIB - #if !defined (_THREAD_SAFE) #define _THREAD_SAFE #endif /* _THREAD_SAFE */ @@ -111,9 +106,6 @@ // Compiler/platform has the getrusage() system call. #define ACE_HAS_GETRUSAGE -// Compiler/platform defines a union semun for SysV shared memory. -#define ACE_LACKS_SEMBUF_T - // Compiler supports the ssize_t typedef. #define ACE_HAS_SSIZE_T @@ -170,4 +162,15 @@ #define TCGETS TIOCGETA #define TCSETS TIOCSETA -#endif /* ACE_CONFIG_H */ +#define ACE_HAS_SEMUN +#define ACE_HAS_SIGINFO_T +#define ACE_LACKS_SIGINFO_H +#define ACE_HAS_UCONTEXT_T +#define ACE_HAS_GETIFADDRS +#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES + +// Remove the following when Apple fixes static template member problem in their +// compiler +#define ACE_HAS_POSITION_INDEPENDENT_POINTERS 0 + +#endif /* ACE_CONFIG_MACOSX_H */ |