diff options
| author | Steve Huston <shuston@riverace.com> | 2003-12-11 23:23:40 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-12-11 23:23:40 +0000 |
| commit | 7fb9475a7a585e1fcda127cddea2721406c12b1c (patch) | |
| tree | b48998c8a8db9f7c1d91749d9bec2e78366b133c | |
| parent | 825cfef2f538ef691ae1141b3dc632c4df7d046e (diff) | |
| download | ATCD-7fb9475a7a585e1fcda127cddea2721406c12b1c.tar.gz | |
ChangeLogTag:Thu Dec 11 18:13:29 2003 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ace/OS_NS_netdb.inl | 6 | ||||
| -rw-r--r-- | ace/OS_NS_stdio.cpp | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 4a63e8569e5..e15674d9f44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,16 @@ +Thu Dec 11 18:13:29 2003 Steve Huston <shuston@riverace.com> + + * ace/OS_NS_netdb.inl: Changed use of naked ::memset() calls to + ACE_OS::memset(). Fixes compile errors on AIX 4.3. + + * ace/OS_NS_stdio.cpp (gets): Added "ACE_STD_NAMESPACE::" prefix to + getchar() call; fixes compile error on AIX 4.3. + Wed Dec 10 18:20:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Message_Queue.h: Mark deprecated enums with @deprecated so that they appear on the - doxygen deprated page + doxygen deprecated page * ace/Thread.h: Moved comment above method instead of between argumens. diff --git a/ace/OS_NS_netdb.inl b/ace/OS_NS_netdb.inl index 19b201804c8..f735f628096 100644 --- a/ace/OS_NS_netdb.inl +++ b/ace/OS_NS_netdb.inl @@ -84,7 +84,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, ACE_NOTSUP_RETURN (0); # elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) # if defined (AIX) || defined (DIGITAL_UNIX) || defined (HPUX_10) - ::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); + ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); if (::gethostbyaddr_r ((char *) addr, length, type, result, (struct hostent_data *) buffer)== 0) @@ -187,7 +187,7 @@ ACE_OS::gethostbyname_r (const char *name, // AIX 4.3 ACE_SOCKCALL_RETURN (::gethostbyname (name), struct hostent *, 0); # elif defined (AIX) || defined (HPUX_10) - ::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); + ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA)); if (::gethostbyname_r (name, result, (struct hostent_data *) buffer) == 0) return result; @@ -478,7 +478,7 @@ ACE_OS::getservbyname_r (const char *svc, ACE_NOTSUP_RETURN (0); #elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) # if defined (AIX) || defined (DIGITAL_UNIX) || defined (HPUX_10) - ::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); + ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA)); if (::getservbyname_r (svc, proto, result, (struct servent_data *) buf) == 0) return result; diff --git a/ace/OS_NS_stdio.cpp b/ace/OS_NS_stdio.cpp index 2abc599be40..bdb8ca16e14 100644 --- a/ace/OS_NS_stdio.cpp +++ b/ace/OS_NS_stdio.cpp @@ -197,7 +197,7 @@ ACE_OS::gets (char *str, int n) if (n == 0) str = 0; else n--; - while ((c = getchar ()) != '\n') + while ((c = ACE_STD_NAMESPACE::getchar ()) != '\n') { if (c == EOF && errno == EINTR) |