diff options
-rw-r--r-- | ace/config-aix-4.x.h | 5 | ||||
-rw-r--r-- | include/makeinclude/platform_aix4_cset++.GNU | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h index 6668f0ba156..42dd77418d8 100644 --- a/ace/config-aix-4.x.h +++ b/ace/config-aix-4.x.h @@ -14,7 +14,10 @@ //******************************************************************** // // Compiler-related definitions. These are set for C Set ++ V3 -# define ACE_HAS_EXCEPTIONS +# if !defined (ACE_HAS_EXCEPTIONS) +# define ACE_HAS_EXCEPTIONS +# endif + // Compiler supports the ssize_t typedef. # define ACE_HAS_SSIZE_T diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU index 37f3c7da559..44ef5396f7b 100644 --- a/include/makeinclude/platform_aix4_cset++.GNU +++ b/include/makeinclude/platform_aix4_cset++.GNU @@ -22,6 +22,9 @@ endif ifeq (,$(distrib)) distrib = 0 endif +ifeq (,$(exceptions)) + exceptions = 1 +endif ifeq (,$(optimize)) optimize = 0 endif @@ -29,6 +32,11 @@ ifeq (,$(threads)) threads = 1 endif +# There's no way to turn off exceptions with IBM C/C++ +ifeq (0,$(exceptions)) + exceptions = 1 +endif + # In case anything here or in the config depends on OS version number, # grab it here and pass it all to the compiler as well. AIX_MAJOR_VERS := $(shell uname -v) |