diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2009-04-10 03:17:24 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2009-04-10 03:17:24 +0000 |
| commit | 549343bfe9502c4feba65f0baf629a54598bd050 (patch) | |
| tree | 7757b4ce080e51d273f3e88cb76ebe0b46bb897a | |
| parent | 96c60b146feb56db23b801e7db88777f895e6b57 (diff) | |
| download | ATCD-549343bfe9502c4feba65f0baf629a54598bd050.tar.gz | |
Fri Apr 10 03:00:44 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* ace/OS_NS_stdlib.inl:
* ace/config-qnx-rtp-common.h:
The newly added [un]setenv wrappers don't compile on qnx rtp
because that platform defines unsetenv as having a void
return. It is possible that other platforms have this as well,
as legacy linux man pages show that signature.
| -rw-r--r-- | ACE/ChangeLog | 38 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_stdlib.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/config-qnx-rtp-common.h | 4 |
3 files changed, 32 insertions, 14 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 52daca0c7a2..affd5f383c6 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Fri Apr 10 03:00:44 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/OS_NS_stdlib.inl: + * ace/config-qnx-rtp-common.h: + + The newly added [un]setenv wrappers don't compile on qnx rtp + because that platform defines unsetenv as having a void + return. It is possible that other platforms have this as well, + as legacy linux man pages show that signature. + Thu Apr 9 12:34:41 UTC 2009 Marcel Smit <msmit@remedy.nl> * ace/OS_NS_stdio.inl: @@ -12,35 +22,35 @@ Wed Apr 8 10:59:59 UTC 2009 Marcel Smit <msmit@remedy.nl> * ace/config-win32-cegcc.h: Added to support CE gcc compiler - + * ace/config-win32-common.h: - Prevent ACE_HAS_CUSTOM_EXPORT_MACROS from + Prevent ACE_HAS_CUSTOM_EXPORT_MACROS from being defined a second time. - + * ace/config-win32.h: - Introduced ACE_HAS_CEGCC. When defined, + Introduced ACE_HAS_CEGCC. When defined, config-win32-cegcc is included. - + * ace/Numeric_Limits.h: "#ifdef" replace by "#if defined" - + * ace/os_include/sys/os_stat.h: Prevent defines from being defined a second time. - + * ace/OS_NS_stdio.inl: - Prevent compiler errors when compiling + Prevent compiler errors when compiling with CE gcc compiler. - - Using global namespace for fseek - + + Using global namespace for fseek + * ace/OS_NS_stdlib.inl: - Prevent compiler errors when compiling + Prevent compiler errors when compiling with CE gcc compiler. - + * ace/OS_NS_Thread.h: Defining STACK_SIZE_PARAM_IS_A_RESERVATION (when it isn't defined yet). - + * ace/OS_NS_time.h: * ace/Time_Value.inl: Prevent pragma warnings when compiling with diff --git a/ACE/ace/OS_NS_stdlib.inl b/ACE/ace/OS_NS_stdlib.inl index 8f634f030be..78d92517c26 100644 --- a/ACE/ace/OS_NS_stdlib.inl +++ b/ACE/ace/OS_NS_stdlib.inl @@ -361,6 +361,10 @@ ACE_OS::unsetenv(const char *name) ACE_UNUSED_ARG (name); ACE_NOTSUP_RETURN (-1); #else +# if defined (ACE_HAS_VOID_UNSETENV) + ::unsetenv (name); + return 0; +# endif /* ACE_HAS_VOID_UNSETENV */ ACE_OSCALL_RETURN (ACE_STD_NAMESPACE::unsetenv (name), int, -1); #endif } diff --git a/ACE/ace/config-qnx-rtp-common.h b/ACE/ace/config-qnx-rtp-common.h index 66879685763..13fa05aa7c7 100644 --- a/ACE/ace/config-qnx-rtp-common.h +++ b/ACE/ace/config-qnx-rtp-common.h @@ -42,5 +42,9 @@ #define ACE_SIZEOF_DOUBLE 8 #define ACE_SIZEOF_FLOAT 4 +// At least qnx 6.3.2 uses a void return for unsetenv +// This assumes that older versions do too. +#define ACE_HAS_VOID_UNSETENV + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_QNX_RTP_COMMON_H */ |