From 2f5a909c2f0d510de0182a50a99a750d0098545c Mon Sep 17 00:00:00 2001 From: Steve Huston Date: Mon, 28 Feb 2011 20:35:39 +0000 Subject: ChangeLogTag:Mon Feb 28 20:29:59 UTC 2011 Steve Huston --- ChangeLog | 8 ++++++++ examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp | 8 ++++---- examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp | 8 ++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0e08d58c08..d124afeba2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 28 20:29:59 UTC 2011 Steve Huston + + * examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp: + * examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp: Replaced the + name "mod_name" with "module_name" to avoid a clash with macro + defined in /usr/include/sys/stropts.h encountered when optimized + build was done. + Mon Feb 28 18:10:19 UTC 2011 Steve Huston * include/makeinclude/platform_aix_ibm.GNU: Remove the -qfuncsect diff --git a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp index a70961a9eaa..aecfaff64d7 100644 --- a/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp +++ b/examples/ASX/Event_Server/Event_Server/Event_Analyzer.cpp @@ -71,12 +71,12 @@ Event_Analyzer::fini (void) int Event_Analyzer::info (ACE_TCHAR **strp, size_t length) const { - const ACE_TCHAR *mod_name = this->name (); + const ACE_TCHAR *module_name = this->name (); - if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0) + if (*strp == 0 && (*strp = ACE_OS::strdup (module_name)) == 0) return -1; else - ACE_OS::strncpy (*strp, mod_name, length); + ACE_OS::strncpy (*strp, module_name, length); - return ACE_Utils::truncate_cast (ACE_OS::strlen (mod_name)); + return ACE_Utils::truncate_cast (ACE_OS::strlen (module_name)); } diff --git a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp index 915f9e79cce..e798f189c52 100644 --- a/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp +++ b/examples/ASX/UPIPE_Event_Server/Event_Analyzer.cpp @@ -62,14 +62,14 @@ Event_Analyzer::fini (void) int Event_Analyzer::info (ACE_TCHAR **strp, size_t length) const { - const ACE_TCHAR *mod_name = this->name (); + const ACE_TCHAR *module_name = this->name (); - if (*strp == 0 && (*strp = ACE_OS::strdup (mod_name)) == 0) + if (*strp == 0 && (*strp = ACE_OS::strdup (module_name)) == 0) return -1; else - ACE_OS::strncpy (*strp, mod_name, length); + ACE_OS::strncpy (*strp, module_name, length); - return ACE_Utils::truncate_cast (ACE_OS::strlen (mod_name)); + return ACE_Utils::truncate_cast (ACE_OS::strlen (module_name)); } #endif /* ACE_HAS_THREADS */ -- cgit v1.2.1