diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-24 12:17:13 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-24 12:17:13 +0000 |
| commit | 387324db5253c0be20ed0cd549cea520ae58741b (patch) | |
| tree | e108e550b90dea85e28d344b08178fe268e8670b /ACE/ace/OS_NS_string.cpp | |
| parent | 92088c51b97700692a4b43161a484093bf4ae5bf (diff) | |
| download | ATCD-387324db5253c0be20ed0cd549cea520ae58741b.tar.gz | |
ChangeLogTag: Sat Oct 24 12:15:40 UTC 2009 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace/OS_NS_string.cpp')
| -rw-r--r-- | ACE/ace/OS_NS_string.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/ACE/ace/OS_NS_string.cpp b/ACE/ace/OS_NS_string.cpp index 02da90a3853..ffb5ef1835a 100644 --- a/ACE/ace/OS_NS_string.cpp +++ b/ACE/ace/OS_NS_string.cpp @@ -1,8 +1,9 @@ // $Id$ +#include "ace/ACE.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_stdio.h" #include "ace/OS_NS_stdlib.h" -#include "ace/ACE.h" ACE_RCSID (ace, OS_NS_string, @@ -12,14 +13,6 @@ ACE_RCSID (ace, # include "ace/OS_NS_string.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ -#if defined (ACE_HAS_WCHAR) -# include "ace/OS_NS_stdlib.h" -#endif /* ACE_HAS_WCHAR */ - -#if !defined (ACE_LACKS_STRERROR) || !defined (ACE_HAS_STRSIGNAL) -# include "ace/OS_NS_stdio.h" -#endif /* ACE_LACKS_STRERROR */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (ACE_LACKS_MEMCHR) @@ -160,10 +153,16 @@ ACE_OS::strerror_emulation (int) char * ACE_OS::strsignal (int signum) { + static char signal_text[128]; #if defined (ACE_HAS_STRSIGNAL) - return ACE_STD_NAMESPACE::strsignal (signum); + char *ret_val = ACE_STD_NAMESPACE::strsignal (signum); + if (ret_val <= reinterpret_cast<char *> (0)) + { + ACE_OS::sprintf (signal_text, "Unknown signal: %d", signum); + ret_val = signal_text; + } + return ret_val; #else - static char signal_text[128]; if (signum < 0 || signum >= ACE_NSIG) { ACE_OS::sprintf (signal_text, "Unknown signal: %d", signum); |