diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | ace/OS_NS_stdio.cpp | 4 | ||||
| -rw-r--r-- | ace/OS_NS_stdio.inl | 2 | ||||
| -rw-r--r-- | ace/OS_TLI.inl | 2 | ||||
| -rw-r--r-- | ace/config-aix-4.x.h | 4 | ||||
| -rw-r--r-- | ace/config-posix.h | 2 |
6 files changed, 26 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 3a82c9e7e24..94f97952d89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +Wed May 25 15:51:03 2005 Steve Totten <totten_s@ociweb.com> + + * ace/OS_NS_stdio.inl: + * ace/OS_NS_stdio.cpp: + * ace/OS_TLI.inl: + * ace/config-aix-4.x.h: + * ace/config-posix.h: + These files were using improper syntax to compare the value of + _XOPEN_SOURCE against a constant that caused compilation errors on + HP-UX 11.23 with HP aC++/ANSI C B3910B A.06.00. For example: + #if defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) + was changed to: + #if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) + + Thanks to Paul Koch <paul.koch@mci.com> for reporting this problem + and providing the solution. + Wed May 25 20:08:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * bin/msvc_static_order.lst: @@ -6,9 +23,9 @@ Wed May 25 20:08:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> Tue May 24 20:09:28 2005 J.T. Conklin <jtc@acorntoolworks.com> - * bin/MakeProjectCreator/config/time.mpb: + * bin/MakeProjectCreator/config/time.mpb: - Inherit from svc_utils.mpb. + Inherit from svc_utils.mpb. Tue May 24 20:46:28 2005 Olli Savia <ops@iki.fi> diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp index 93bbde7fce0..381633fb319 100644 --- a/ace/OS_NS_stdio.cpp +++ b/ace/OS_NS_stdio.cpp @@ -317,7 +317,7 @@ int ACE_OS::snprintf (wchar_t *buf, size_t maxlen, const wchar_t *format, ...) { // ACE_OS_TRACE ("ACE_OS::snprintf"); -#if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || defined (ACE_WIN32) +#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || defined (ACE_WIN32) int result; va_list ap; va_start (ap, format); @@ -377,7 +377,7 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...) { ACE_OS_TRACE ("ACE_OS::sprintf"); -# if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || (defined ACE_HAS_DINKUM_STL) || defined (__DMC__) +# if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || (defined ACE_HAS_DINKUM_STL) || defined (__DMC__) // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a // maxlen argument. Since this method doesn't supply one, pass in diff --git a/ace/OS_NS_stdio.inl b/ace/OS_NS_stdio.inl index 421377fcbd0..08629d02112 100644 --- a/ace/OS_NS_stdio.inl +++ b/ace/OS_NS_stdio.inl @@ -1024,7 +1024,7 @@ ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr) ACE_INLINE int ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) { -# if (defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) || \ +# if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) || \ (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ (defined (ACE_HAS_DINKUM_STL) || defined (__DMC__)) diff --git a/ace/OS_TLI.inl b/ace/OS_TLI.inl index d88655338fb..307a53f6fa0 100644 --- a/ace/OS_TLI.inl +++ b/ace/OS_TLI.inl @@ -23,7 +23,7 @@ ACE_INLINE char * t_alloc (ACE_HANDLE handle, int struct_type, int fields) { #if defined (ACE_HAS_TLI) -# if (_XOPEN_SOURCE - 0 >= 500) +# if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) // XPG5 changes t_alloc() return from char* to void*, so ACE_OSCALL_RETURN // doesn't compile correctly. char *result; diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h index 0678dfd0449..e930fee72fe 100644 --- a/ace/config-aix-4.x.h +++ b/ace/config-aix-4.x.h @@ -312,9 +312,9 @@ #define ACE_MALLOC_ALIGN 8 -#if (_XOPEN_SOURCE >= 500) && !defined(_UNIX95) +#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) && !defined(_UNIX95) # define ACE_HAS_3_PARAM_WCSTOK -#endif /* _XOPEN_SOURCE == 500 && !_UNIX95 */ +#endif /* (_XOPEN_SOURCE -0) >= 500 && !_UNIX95 */ #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ace/config-posix.h b/ace/config-posix.h index fdf6a7b2fd7..a103215dcb6 100644 --- a/ace/config-posix.h +++ b/ace/config-posix.h @@ -68,7 +68,7 @@ # endif /* ACE_HAS_POSIX_MESSAGE_PASSING */ #endif /* _POSIX_MESSAGE_PASSING */ -#if defined (_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +#if (defined _XOPEN_SOURCE && (_XOPEN_SOURCE - 0) >= 500) # define ACE_HAS_SNPRINTF #endif /* _XOPEN_SOURCE */ |