diff options
| author | Steve Huston <shuston@riverace.com> | 2002-12-31 20:07:35 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-12-31 20:07:35 +0000 |
| commit | e6df174d4a57ef1d1f966d8dfc98bccf1c7c858b (patch) | |
| tree | 6dcb9c7a932351fec9600458fbdca12145c9fcfe | |
| parent | c8c8dd504e89a5988d08b295b665fd8ec6c09e28 (diff) | |
| download | ATCD-e6df174d4a57ef1d1f966d8dfc98bccf1c7c858b.tar.gz | |
ChangeLogTag:Tue Dec 31 15:05:42 2002 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACEXML/apps/svcconf/Svcconf.cpp | 11 | ||||
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | netsvcs/clients/Naming/Client/Makefile | 1 |
4 files changed, 27 insertions, 5 deletions
diff --git a/ACEXML/apps/svcconf/Svcconf.cpp b/ACEXML/apps/svcconf/Svcconf.cpp index 0817cde90bd..12a6f3144fc 100644 --- a/ACEXML/apps/svcconf/Svcconf.cpp +++ b/ACEXML/apps/svcconf/Svcconf.cpp @@ -107,10 +107,11 @@ ACEXML_Svcconf_Parser::parse_string (const ACE_TCHAR str[]) #else -# if defined (ACE_AIX_VERS) && (ACE_AIX_VERS == 403) -// This simply shuts up the AIX 4.3 linker that complains there are no -// csects or exported symbols from the shared library. -extern "C" void shut_up_aix_ld (void) {}; -# endif /* AIX 4.3 */ +# if defined (_AIX) && \ + (defined (__IBMCPP__) && (__IBMCPP__ >= 500) && (__IBMCPP__ < 600)) +// This simply shuts up the AIX linker that complains there are no +// csects or exported symbols when building with Visual Age C++ 5. +extern "C" void ace_shut_up_aix_ld (void) {}; +# endif /* AIX && __IBMCPP__ == 500 */ #endif /* ACE_USES_CLASSIC_SVC_CONF == 0 */ diff --git a/ChangeLog b/ChangeLog index cc4c28999b9..97ad083a596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Dec 31 15:05:42 2002 Steve Huston <shuston@riverace.com> + + * ACEXML/apps/svcconf/Svcconf.cpp: Changed the condition for when + a dummy entrypoint is needed from AIX 4.3 to AIX and Visual Age C++ + version 5. Thanks for Jon Wackley for this adjustment. Also see: + Fri Dec 27 19:46:31 2002 Steve Huston <shuston@riverace.com> + + * netsvcs/clients/Naming/Client/Makefile: If building this stuff, + reset OBJDIRS to $(VDIR) and $(VSHDIR) to clean up both. + Mon Dec 30 21:30:41 2002 Steve Huston <shuston@riverace.com> * include/makeinclude/platform_hpux_gcc.GNU: Removed the SOVERSION= diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index cc4c28999b9..97ad083a596 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Tue Dec 31 15:05:42 2002 Steve Huston <shuston@riverace.com> + + * ACEXML/apps/svcconf/Svcconf.cpp: Changed the condition for when + a dummy entrypoint is needed from AIX 4.3 to AIX and Visual Age C++ + version 5. Thanks for Jon Wackley for this adjustment. Also see: + Fri Dec 27 19:46:31 2002 Steve Huston <shuston@riverace.com> + + * netsvcs/clients/Naming/Client/Makefile: If building this stuff, + reset OBJDIRS to $(VDIR) and $(VSHDIR) to clean up both. + Mon Dec 30 21:30:41 2002 Steve Huston <shuston@riverace.com> * include/makeinclude/platform_hpux_gcc.GNU: Removed the SOVERSION= diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile index 6459b2ab39f..391e49b296c 100644 --- a/netsvcs/clients/Naming/Client/Makefile +++ b/netsvcs/clients/Naming/Client/Makefile @@ -33,6 +33,7 @@ ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS))) BIN = main SHLIB = libClient_Test.$(SOEXT) BUILD = $(VSHLIB) $(VBIN) + OBJDIRS = $(VDIR) $(VSHDIR) endif # Other endif # static_libs_only include $(ACE_ROOT)/include/makeinclude/rules.common.GNU |