diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-14 08:09:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-14 08:09:32 +0000 |
| commit | 9273f317474bb8e417db6802d1b2cf802ae223b4 (patch) | |
| tree | 9175fbc306b85deb387f4ced00f40711370e7fe2 | |
| parent | 8807d87fd3d6eb76485579581ad30f74ec5335b1 (diff) | |
| download | ATCD-9273f317474bb8e417db6802d1b2cf802ae223b4.tar.gz | |
Wed Mar 14 08:09:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ace/config-linux-common.h | 2 | ||||
| -rw-r--r-- | ACE/ace/config-lite.h | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_suncc.GNU | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 2a4323dc2e4..598bf6cd3e5 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -183,6 +183,8 @@ # undef ACE_LACKS_LLSEEK_PROTOTYPE # undef ACE_LACKS_LSEEK64_PROTOTYPE # include "ace/config-borland-common.h" +#elif defined (__SUNCC_PRO) +# include "ace/config-suncc-common.h" #elif defined (__PGI) // Portable group compiler # define ACE_HAS_CPLUSPLUS_HEADERS diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 69466bbe394..0ed4c1bcaac 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -122,7 +122,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL // Once all C++ compilers support the standard reverse_iterator // adapters, we can drop this generator macro or at least drop the // MSVC++ or Sun Studio preprocessor conditional blocks. -#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580 \ +#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590 \ && !defined (_STLPORT_VERSION) // If we're not using the stlport4 C++ library (which has standard // iterators), we need to ensure this is included in order to test @@ -136,7 +136,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL typedef std::reverse_iterator<iterator, value_type> reverse_iterator; \ typedef std::reverse_iterator<const_iterator, \ value_type const> const_reverse_iterator; -#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580 \ +#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x590 \ && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) # define ACE_DECLARE_STL_REVERSE_ITERATORS \ typedef std::reverse_iterator<iterator, \ diff --git a/ACE/include/makeinclude/platform_linux_suncc.GNU b/ACE/include/makeinclude/platform_linux_suncc.GNU index 02016cefd4e..43a4e839868 100644 --- a/ACE/include/makeinclude/platform_linux_suncc.GNU +++ b/ACE/include/makeinclude/platform_linux_suncc.GNU @@ -103,6 +103,13 @@ ifeq ($(shared_libs), 1) endif endif +ifeq ($(buildbits),32) + CFLAGS += -m32 + LDFLAGS += -m32 +endif +ifeq ($(buildbits),64) + CFLAGS += -m64 +endif # Added line below to support "Executable Shared Object" files (as # needed by the service configurator). |