diff options
Diffstat (limited to 'ace/config-linux-common.h')
| -rw-r--r-- | ace/config-linux-common.h | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h index 0352d866371..224cd7cd533 100644 --- a/ace/config-linux-common.h +++ b/ace/config-linux-common.h @@ -110,17 +110,18 @@ // macros to make prototypes visible. # define ACE_LACKS_GETPGID_PROTOTYPE -// @note the following defines are necessary with glibc 2.0 (0.961212-5) +// NOTE: the following defines are necessary with glibc 2.0 (0.961212-5) // on Alpha. I assume that they're necessary on Intel as well, // but that may depend on the version of glibc that is used. //# define ACE_HAS_DLFCN_H_BROKEN_EXTERN_C # define ACE_HAS_VOIDPTR_SOCKOPT +# define ACE_LACKS_SYSTIME_H // Don't define _POSIX_SOURCE in ACE to make strtok() prototype // visible. ACE shouldn't depend on feature test macros to make // prototypes visible. # define ACE_LACKS_STRTOK_R_PROTOTYPE -// @note end of glibc 2.0 (0.961212-5)-specific configuration. +// NOTE: end of glibc 2.0 (0.961212-5)-specific configuration. // These macros determined by reading <stdio.h> on RH 7.1 and glibc's // <features.h>. @@ -173,14 +174,11 @@ #if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3) # define ACE_HAS_ISASTREAM_PROTO # define ACE_HAS_PTHREAD_SIGMASK_PROTO -# define ACE_HAS_CPU_SET_T #endif /* __GLIBC__ > 2 || __GLIBC__ === 2 && __GLIBC_MINOR__ >= 3) */ // Then the compiler specific parts -#if defined (__INTEL_COMPILER) -# include "ace/config-icc-common.h" -#elif defined (__GNUG__) +#if 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 @@ -199,6 +197,8 @@ #elif defined (__DECCXX) # define ACE_CONFIG_INCLUDE_CXX_COMMON # include "ace/config-cxx-common.h" +#elif defined (__INTEL_COMPILER) +# include "ace/config-icc-common.h" #elif defined (__BORLANDC__) # undef ACE_HAS_LLSEEK # undef ACE_HAS_LSEEK64 @@ -215,30 +215,17 @@ # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_LACKS_SWAB # undef ACE_HAS_CLOCK_GETTIME -#elif defined (__GNUC__) -/** - * GNU C compiler. - * - * We need to recognize the GNU C compiler since TAO has at least one - * C source header and file - * (TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.{h,c}) that may indirectly - * include this - */ #else /* ! __GNUG__ && ! __KCC && !__DECCXX && !__INTEL_COMPILER && !__BORLANDC__ && !__PGI */ -# ifdef __cplusplus /* Let it slide for C compilers. */ -# error unsupported compiler in ace/config-linux-common.h -# endif /* __cplusplus */ +# error unsupported compiler in ace/config-linux-common.h #endif /* ! __GNUG__ && ! __KCC */ -// Completely common part :-) +// Completely common part :-) // Platform/compiler has the sigwait(2) prototype # define ACE_HAS_SIGWAIT # define ACE_HAS_SIGSUSPEND -# define ACE_HAS_UALARM - #if __GLIBC__ >= 2 #ifndef ACE_HAS_POSIX_REALTIME_SIGNALS #define ACE_HAS_POSIX_REALTIME_SIGNALS @@ -287,6 +274,12 @@ #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES +// ACE WChar support +#define ACE_SIZEOF_WCHAR 4 +#define ACE_WCHAR_MAX 0x7FFFFFFF +#define ACE_LACKS_BUILTIN_WCHAR_T + + // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT @@ -384,9 +377,12 @@ #if defined (__ia64) || defined(__alpha) || defined (__x86_64__) // On 64 bit platforms, the "long" type is 64-bits. Override the // default 32-bit platform-specific format specifiers appropriately. -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +# define ACE_UINT64_FORMAT_SPECIFIER_A "%lu" +# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_UINT64_FORMAT_SPECIFIER_A) +# define ACE_SSIZE_T_FORMAT_SPECIFIER_A "%ld" +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_A) +# define ACE_SIZE_T_FORMAT_SPECIFIER_A "%lu" +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_A) #endif /* __ia64 */ #define ACE_SIZEOF_WCHAR 4 @@ -412,3 +408,4 @@ #include /**/ "ace/post.h" #endif /* ACE_LINUX_COMMON_H */ + |