*Massive cleanup (\n\n -> \n, *\n -> \n, cleanup for(...) to for (...), and some other cleanups by hand)
*Fix a possible crash in Spell::DoAllEffectOnTarget --HG-- branch : trunk
This commit is contained in:
maximius
@@ -1,10 +1,8 @@
|
||||
// $Id: config-aix-5.x.h 80826 2008-03-04 14:51:23Z wotte $
|
||||
//
|
||||
// Config file for AIX 5.1 and higher.
|
||||
|
||||
#ifndef ACE_CONFIG_AIX_5_X_H
|
||||
#define ACE_CONFIG_AIX_5_X_H
|
||||
|
||||
// This define is needed for building with Visual Age C++ 5 in incremental
|
||||
// mode. In the batch mode build, platform_aix_ibm.GNU sets it. The incremental
|
||||
// mode compiler won't be supported after ACE 5.3, so this will also go away
|
||||
@@ -12,7 +10,6 @@
|
||||
#if !defined (ACE_AIX_VERS)
|
||||
# define ACE_AIX_VERS 501
|
||||
#endif
|
||||
|
||||
// AIX 5.1 has AIO, but it doesn't have the same API as other POSIX
|
||||
// systems, and the semantics of operations are a bit different. Will take
|
||||
// some real work to get this going.
|
||||
@@ -26,7 +23,6 @@
|
||||
#if !defined (ACE_HAS_AIO_CALLS)
|
||||
# define _ACE_DISABLE_AIO_CALLS_
|
||||
#endif
|
||||
|
||||
// Both IBM and g++ compilers set _THREAD_SAFE if compiler is asked to compile
|
||||
// threaded code (xlC_r, as opposed to xlC; and g++ -pthread)
|
||||
#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0)
|
||||
@@ -39,32 +35,26 @@
|
||||
// # define ACE_HAS_THREADS 0
|
||||
# endif /* _THREAD_SAFE */
|
||||
#endif /* !ACE_MT_SAFE || (ACE_MT_SAFE != 0) */
|
||||
|
||||
#if defined (__xlC__) || defined (__IBMCPP__)
|
||||
// AIX xlC, IBM C/C++, and Visual Age C++ compilers
|
||||
//********************************************************************
|
||||
//
|
||||
|
||||
// Compiler does this with a builtin - it's not in libc.
|
||||
// Although ACE does have alloca() on this compiler/platform combination, it is
|
||||
// disabled by default since it can be dangerous. Uncomment the following line
|
||||
// if you ACE to use it.
|
||||
//# define ACE_HAS_ALLOCA
|
||||
|
||||
// Compiler supports the ssize_t typedef.
|
||||
# define ACE_HAS_SSIZE_T
|
||||
|
||||
// Keep an eye on this as the compiler and standards converge...
|
||||
# define ACE_LACKS_LINEBUFFERED_STREAMBUF
|
||||
# define ACE_LACKS_PRAGMA_ONCE
|
||||
|
||||
// C Set++ 3.1, IBM C/C++ 3.6, and Visual Age C++ 5 batch (__xlC__)
|
||||
# if defined (__xlC__)
|
||||
# if (__xlC__ < 0x0500)
|
||||
# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
|
||||
# endif /* __xlC__ < 0x0500 */
|
||||
# endif
|
||||
|
||||
// These are for Visual Age C++ only
|
||||
# if defined (__IBMCPP__) && (__IBMCPP__ >= 600)
|
||||
# define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
|
||||
@@ -81,12 +71,10 @@
|
||||
# define ACE_TEMPLATES_REQUIRE_SOURCE
|
||||
# endif
|
||||
# endif /* __TEMPINC__ */
|
||||
|
||||
# undef WIFEXITED
|
||||
# undef WEXITSTATUS
|
||||
# define ACE_HAS_STANDARD_CPP_LIBRARY 1
|
||||
# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
|
||||
|
||||
# if (__IBMCPP__ >= 600) /* Visual Age 6 and XL C/C++ 7 and up */
|
||||
# define ACE_HAS_TEMPLATE_TYPEDEFS
|
||||
# define ACE_HAS_CUSTOM_EXPORT_MACROS
|
||||
@@ -95,157 +83,116 @@
|
||||
# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) extern template class SINGLETON_TYPE < CLASS, LOCK >;
|
||||
# endif /* __IBMCPP__ >= 600 */
|
||||
# endif /* __IBMCPP__ */
|
||||
|
||||
#elif defined (__GNUG__)
|
||||
// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
|
||||
// this must appear before its #include.
|
||||
# define ACE_HAS_STRING_CLASS
|
||||
|
||||
# include "ace/config-g++-common.h"
|
||||
// Denotes that GNU has cstring.h as standard, to redefine memchr().
|
||||
# define ACE_HAS_GNU_CSTRING_H
|
||||
# define ACE_HAS_SSIZE_T
|
||||
|
||||
# if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 0))
|
||||
// We have to explicitly instantiate static template members prior to g++ 4.1
|
||||
# define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION
|
||||
#endif /* g++ prior to 4.1 */
|
||||
|
||||
# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
|
||||
// ACE_MT_SAFE is #defined below, for all compilers.
|
||||
# if !defined (_REENTRANT)
|
||||
# define _REENTRANT
|
||||
# endif /* _REENTRANT */
|
||||
# endif /* !ACE_MT_SAFE */
|
||||
|
||||
#else /* ! __xlC__ && ! __GNUG__ */
|
||||
# ifdef __cplusplus /* Let it slide for C compilers. */
|
||||
# error unsupported compiler in ace/config-aix-5.x.h
|
||||
# endif /* __cplusplus */
|
||||
#endif /* ! __xlC__ && ! __GNUG__ */
|
||||
|
||||
// Compiling for AIX.
|
||||
#ifndef AIX
|
||||
# define AIX
|
||||
#endif /* AIX */
|
||||
|
||||
// Pick up all the detectable settings.
|
||||
#include "ace/config-posix.h"
|
||||
|
||||
// Regardless of what config-posix.h may indicate, AIX 5.3 is the first
|
||||
// to support sem_timedwait(). Prior to that, use the emulation.
|
||||
#if defined (ACE_HAS_POSIX_SEM_TIMEOUT) && \
|
||||
(defined (ACE_AIX_VERS) && (ACE_AIX_VERS < 503))
|
||||
# undef ACE_HAS_POSIX_SEM_TIMEOUT
|
||||
#endif /* ACE_HAS_POSIX_SEM_TIMEOUT && ACE_AIX_VERS < 503 */
|
||||
|
||||
#if defined (ACE_DLL_SUFFIX)
|
||||
# undef ACE_DLL_SUFFIX
|
||||
#endif
|
||||
#define ACE_DLL_SUFFIX ".so"
|
||||
|
||||
#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
|
||||
|
||||
#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
|
||||
|
||||
#define ACE_HAS_SOCKLEN_T
|
||||
#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
|
||||
|
||||
// AIX has AIO, but the functions don't match those of other AIO-enabled
|
||||
// platforms. If this is to work, it'll require some significant work,
|
||||
// maybe moving the OS-abstraction stuff to an OS_AIO or some such thing.
|
||||
//# define ACE_HAS_AIO_CALLS
|
||||
|
||||
#define ACE_HAS_AIX_HI_RES_TIMER
|
||||
|
||||
// Compiler/platform has correctly prototyped header files.
|
||||
#define ACE_HAS_CPLUSPLUS_HEADERS
|
||||
|
||||
// Prototypes for both signal() and struct sigaction are consistent.
|
||||
#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
|
||||
|
||||
// OS has readdir and friends.
|
||||
#define ACE_HAS_DIRENT
|
||||
|
||||
// OS supports the getrusage() system call
|
||||
#define ACE_HAS_GETRUSAGE
|
||||
|
||||
#define ACE_HAS_GPERF
|
||||
|
||||
#define ACE_HAS_H_ERRNO
|
||||
|
||||
#define ACE_LACKS_STDINT_H
|
||||
#define ACE_LACKS_SYS_SYSCTL_H
|
||||
|
||||
#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
|
||||
#define ACE_HAS_NONCONST_SELECT_TIMEVAL
|
||||
#define ACE_HAS_IP_MULTICAST
|
||||
|
||||
// Lacks perfect filtering, must bind group address.
|
||||
#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING
|
||||
# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
|
||||
#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */
|
||||
|
||||
#define ACE_HAS_MSG
|
||||
|
||||
// Compiler/platform supports poll().
|
||||
#define ACE_HAS_POLL
|
||||
|
||||
// Platform supports POSIX O_NONBLOCK semantics.
|
||||
#define ACE_HAS_POSIX_NONBLOCK
|
||||
|
||||
#define ACE_HAS_POSIX_TIME
|
||||
// ... but needs to include another header for it on 4.2+
|
||||
# define ACE_HAS_BROKEN_POSIX_TIME
|
||||
// ... and needs another typedef
|
||||
#define ACE_LACKS_TIMESPEC_T
|
||||
#define ACE_HAS_SELECT_H
|
||||
|
||||
#define ACE_HAS_REENTRANT_FUNCTIONS
|
||||
|
||||
// Compiler/platform defines the sig_atomic_t typedef
|
||||
#define ACE_HAS_SIG_ATOMIC_T
|
||||
#define ACE_HAS_SIGINFO_T
|
||||
#define ACE_LACKS_SIGINFO_H
|
||||
#define ACE_HAS_P_READ_WRITE
|
||||
|
||||
#define ACE_HAS_SIGWAIT
|
||||
#define ACE_HAS_SOCKADDR_IN_SIN_LEN
|
||||
#define ACE_HAS_STRBUF_T
|
||||
|
||||
// Compiler supports stropts.h
|
||||
#define ACE_HAS_STREAMS
|
||||
// #define ACE_HAS_STREAM_PIPES
|
||||
|
||||
// Compiler/platform supports strerror ().
|
||||
#define ACE_HAS_STRERROR
|
||||
|
||||
// AIX bzero()
|
||||
#define ACE_HAS_STRINGS
|
||||
|
||||
#define ACE_HAS_STRUCT_NETDB_DATA
|
||||
|
||||
// Dynamic linking is in good shape on newer OS/patch levels. If you have
|
||||
// trouble with the dynamic linking parts of ACE, and can't patch your OS
|
||||
// up to latest levels, comment this out.
|
||||
#define ACE_HAS_SVR4_DYNAMIC_LINKING
|
||||
// This is tightly related to dynamic linking...
|
||||
#define ACE_HAS_AUTOMATIC_INIT_FINI
|
||||
|
||||
#define ACE_HAS_SVR4_GETTIMEOFDAY
|
||||
|
||||
#define ACE_HAS_SYSV_IPC
|
||||
#define ACE_HAS_TIMOD_H
|
||||
#define ACE_HAS_XTI
|
||||
#define ACE_HAS_BROKEN_T_ERROR
|
||||
#define ACE_TLI_TCP_DEVICE "/dev/xti/tcp"
|
||||
|
||||
#define ACE_HAS_UALARM
|
||||
|
||||
#define ACE_HAS_UCONTEXT_T
|
||||
|
||||
#define ACE_HAS_UTIME
|
||||
|
||||
// Platform has XPG4 wide character type and functions. However, the size
|
||||
// of wchar_t changes for 32- vs. 64-bit builds (unsigned short vs. unsigned
|
||||
// int, respectively).
|
||||
@@ -255,15 +202,11 @@
|
||||
#else
|
||||
# define ACE_SIZEOF_WCHAR 2
|
||||
#endif /* __64BIT__ */
|
||||
|
||||
#define ACE_LACKS_NETINET_TCP_H
|
||||
|
||||
// AIX uses LIBPATH to search for libraries
|
||||
#define ACE_LD_SEARCH_PATH "LIBPATH"
|
||||
|
||||
// Defines the page size of the system.
|
||||
#define ACE_PAGE_SIZE 4096
|
||||
|
||||
//**************************************************************
|
||||
//
|
||||
// Threads related definitions.
|
||||
@@ -274,12 +217,10 @@
|
||||
// pthread_t, and can't derive one from the other - thread_self() gets
|
||||
// the tid_t (kernel thread ID) if called from a thread.
|
||||
// Thanks very much to Chris Lahey for straightening this out.
|
||||
|
||||
#if defined (ACE_HAS_THREADS)
|
||||
# if !defined (ACE_MT_SAFE)
|
||||
# define ACE_MT_SAFE 1
|
||||
# endif
|
||||
|
||||
# define ACE_HAS_PTHREADS
|
||||
# define ACE_HAS_PTHREADS_UNIX98_EXT
|
||||
# define ACE_HAS_PTHREAD_CONTINUE_NP
|
||||
@@ -288,25 +229,20 @@
|
||||
# define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
|
||||
# define ACE_HAS_SIGTHREADMASK
|
||||
# define ACE_HAS_THREAD_SPECIFIC_STORAGE
|
||||
|
||||
# define ACE_LACKS_THREAD_PROCESS_SCOPING
|
||||
#else
|
||||
# undef ACE_HAS_THREADS
|
||||
#endif /* ACE_HAS_THREADS != 0 */
|
||||
|
||||
#define ACE_MALLOC_ALIGN 8
|
||||
|
||||
#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) && !defined(_UNIX95)
|
||||
# define ACE_HAS_3_PARAM_WCSTOK
|
||||
#endif /* (_XOPEN_SOURCE -0) >= 500 && !_UNIX95 */
|
||||
|
||||
#if defined (_ACE_DISABLE_AIO_CALLS_)
|
||||
# if defined (ACE_HAS_AIO_CALLS)
|
||||
# undef ACE_HAS_AIO_CALLS
|
||||
# endif
|
||||
# undef _ACE_DISABLE_AIO_CALLS_
|
||||
#endif
|
||||
|
||||
// AIX's /usr/include/unistd.h sets _POSIX_SEMAPHORE to indicate the system
|
||||
// supplies such a facility, but the headers don't enable it unless
|
||||
// _XOPEN_SOURCE >= 500. So disable semaphores here if _XOPEN_SOURCE isn't
|
||||
@@ -315,13 +251,10 @@
|
||||
(!defined (_XOPEN_SOURCE) || (_XOPEN_SOURCE-0 < 500))
|
||||
# undef ACE_HAS_POSIX_SEM
|
||||
#endif
|
||||
|
||||
// I think this is correct, but needs to be verified... -Steve Huston
|
||||
#define ACE_HAS_SIGTIMEDWAIT
|
||||
|
||||
// AIX 5.1 has netinet/tcp.h
|
||||
#undef ACE_LACKS_NETINET_TCP_H
|
||||
|
||||
#define ACE_HAS_3_PARAM_READDIR_R
|
||||
#define ACE_HAS_POSIX_GETPWNAM_R
|
||||
#define ACE_HAS_SCANDIR
|
||||
@@ -329,6 +262,5 @@
|
||||
#define ACE_SCANDIR_SEL_LACKS_CONST
|
||||
#define ACE_HAS_SIGSUSPEND
|
||||
#define ACE_HAS_TIMEZONE /* Call tzset() to set timezone */
|
||||
|
||||
#endif /* ACE_CONFIG_AIX_5_X_H */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user