From fee50c1243ae11254fa1ea34621f9060d5c31b90 Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Tue, 6 Jan 2004 22:55:49 +0000 Subject: ChangeLogTag:Tue Jan 6 17:50:31 2004 Steve Huston --- ChangeLog | 21 +++++++++++++++++++++ ace/TLI.cpp | 8 ++++---- include/makeinclude/platform_aix_g++.GNU | 5 +---- include/makeinclude/platform_g++_common.GNU | 6 +++++- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3642ca8e7cc..6c7bb13ea3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Tue Jan 6 17:50:31 2004 Steve Huston + + * ace/TLI.cpp (get_option, set_option): For the XPG5 case, use + a auto_ptr to hold the allocated buff pointer, even though + it's a void*, to compile correctly. Need to cast this to make + it work. + + * include/makeinclude/platform_aix_g++.GNU: Change -ltli_r to -lxti + to use XTI instead of TLI. Also see: + Mon Dec 29 17:09:29 2003 Steve Huston + Removed the versioned_so=0 default - with versioned_so=0, the rule + for making VLIB gets overridden by the one for VSHLIB: shr.o. Not + sure how to remedy this, but by making a versioned_so, it's at + least building it normally. + + * include/makeinclude/platform_g++_common.GNU: Made with_ld=aix not + try to set any versioned_so linker options. The default doesn't work, + and as long as we're linking to archives that contain shr.o, this + is probably fine. If we ever get rtl mode working, this probably + needs to be revisited. + Tue Jan 6 14:00:12 2004 Steve Huston * examples/APG/Logging/Trace.h: diff --git a/ace/TLI.cpp b/ace/TLI.cpp index 63a036c68f6..9e60c947e0d 100644 --- a/ace/TLI.cpp +++ b/ace/TLI.cpp @@ -129,7 +129,7 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen) struct t_optmgmt req, ret; ACE_NEW_RETURN (req.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1); # if (_XOPEN_SOURCE - 0 >= 500) - auto_ptr req_opt_buf_p (req.opt.buf); + auto_ptr req_opt_buf_p (ACE_reinterpret_cast (char*, req.opt.buf)); # else ACE_Auto_Array_Ptr req_opt_buf_p (req.opt.buf); # endif /* XPG5 vs XPG4 */ @@ -137,7 +137,7 @@ ACE_TLI::set_option (int level, int option, void *optval, int optlen) ACE_reinterpret_cast (struct t_opthdr *, req.opt.buf); ACE_NEW_RETURN (ret.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1); # if (_XOPEN_SOURCE - 0 >= 500) - auto_ptr ret_opt_buf_p (ret.opt.buf); + auto_ptr ret_opt_buf_p (ACE_reinterpret_cast (char*, ret.opt.buf)); # else ACE_Auto_Array_Ptr ret_opt_buf_p (ret.opt.buf); # endif /* XPG5 vs XPG4 */ @@ -194,7 +194,7 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen) struct t_optmgmt req, ret; ACE_NEW_RETURN (req.opt.buf, char[sizeof (struct t_opthdr)], -1); # if (_XOPEN_SOURCE - 0 >= 500) - auto_ptr req_opt_buf_p (req.opt.buf); + auto_ptr req_opt_buf_p (ACE_reinterpret_cast (char*, req.opt.buf)); # else ACE_Auto_Array_Ptr req_opt_buf_p (req.opt.buf); # endif /* XPG5 vs XPG4 */ @@ -202,7 +202,7 @@ ACE_TLI::get_option (int level, int option, void *optval, int &optlen) ACE_reinterpret_cast (struct t_opthdr *, req.opt.buf); ACE_NEW_RETURN (ret.opt.buf, char[sizeof (struct t_opthdr) + optlen], -1); # if (_XOPEN_SOURCE - 0 >= 500) - auto_ptr ret_opt_buf_p (ret.opt.buf); + auto_ptr ret_opt_buf_p (ACE_reinterpret_cast (char*, ret.opt.buf)); # else ACE_Auto_Array_Ptr ret_opt_buf_p (ret.opt.buf); # endif /* XPG5 vs XPG4 */ diff --git a/include/makeinclude/platform_aix_g++.GNU b/include/makeinclude/platform_aix_g++.GNU index f875d1546de..bad25425eb8 100644 --- a/include/makeinclude/platform_aix_g++.GNU +++ b/include/makeinclude/platform_aix_g++.GNU @@ -28,9 +28,6 @@ endif ifeq (,$(buildbits)) buildbits = native endif -ifeq (,$(versioned_so)) - versioned_so = 0 -endif ifeq (,$(with_ld)) with_ld = aix endif @@ -79,7 +76,7 @@ ifeq ($(threads),1) SOFLAGS += -pthread endif SOFLAGS += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map -LIBS += -ltli_r -ldl +LIBS += -lxti -ldl ARFLAGS = cruv RANLIB = ranlib diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU index 3cf2db9691c..047c8d6e158 100644 --- a/include/makeinclude/platform_g++_common.GNU +++ b/include/makeinclude/platform_g++_common.GNU @@ -58,7 +58,11 @@ ifeq ($(versioned_so),1) else ifeq ($(with_ld),openbsd) else - SOFLAGS += -Wl,-h -Wl,$(SONAME) + ifeq ($(with_ld),aix) + # What to do here??? + else + SOFLAGS += -Wl,-h -Wl,$(SONAME) + endif endif endif endif -- cgit v1.2.1