diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-09-14 22:18:55 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-09-14 22:18:55 +0000 |
| commit | d3645b85237a122528cf9e6a10c25230f2d09f95 (patch) | |
| tree | 000c5cb43c1e94f4784e2b15a9d4f039ac48aac2 | |
| parent | 6a6c20a9b19b3d9c948d6204e37a4bd75612ac32 (diff) | |
| download | ATCD-d3645b85237a122528cf9e6a10c25230f2d09f95.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-98b | 12 | ||||
| -rw-r--r-- | ace/ACE.cpp | 22 | ||||
| -rw-r--r-- | ace/OS.h | 2 | ||||
| -rw-r--r-- | ace/README | 2 | ||||
| -rw-r--r-- | ace/config-win32-common.h | 1 |
5 files changed, 22 insertions, 17 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 22b50670e3a..f5834a6fd89 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,7 +1,15 @@ Mon Sep 14 17:09:04 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - * include/makeinclude/platform_mvs.GNU: Updated the MVS - platform configuration as follows: + * ace/config-win32-common.h,OS.h,README: Removed all mention of + ACE_LACKS_FIFO, which was no longer necessary. Thanks to Ossama + Othman <othman@astrosun.tn.cornell.edu> for suggesting this. + + * ace/ACE.cpp (bind_port): Renamed sin to sock_addr to make the + autoconf script happier. Thanks to Ossama Othman + <othman@astrosun.tn.cornell.edu> for suggesting this. + + * include/makeinclude/platform_mvs.GNU: Updated the MVS platform + configuration as follows: changed: debug = 1 diff --git a/ace/ACE.cpp b/ace/ACE.cpp index fad7898ae1b..2bf2feda07b 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -1756,21 +1756,21 @@ ACE::bind_port (ACE_HANDLE handle, { ACE_TRACE ("ACE::bind_port"); - sockaddr_in sin; + sockaddr_in sock_addr; - ACE_OS::memset ((void *) &sin, 0, sizeof sin); - sin.sin_family = AF_INET; + ACE_OS::memset ((void *) &sock_addr, 0, sizeof sock_addr); + sock_addr.sin_family = AF_INET; #if defined (ACE_HAS_SIN_LEN) - sin.sin_len = sizeof sin; + sock_addr.sin_len = sizeof sock_addr; #endif /* ACE_HAS_SIN_LEN */ - sin.sin_addr.s_addr = ip_addr; + sock_addr.sin_addr.s_addr = ip_addr; #if !defined (ACE_LACKS_WILDCARD_BIND) // The OS kernel should select a free port for us. - sin.sin_port = 0; + sock_addr.sin_port = 0; return ACE_OS::bind (handle, - ACE_reinterpret_cast(sockaddr *, &sin), - sizeof sin); + ACE_reinterpret_cast(sockaddr *, &sock_addr), + sizeof sock_addr); #else static u_short upper_limit = ACE_MAX_DEFAULT_PORT; int round_trip = upper_limit; @@ -1780,11 +1780,11 @@ ACE::bind_port (ACE_HANDLE handle, for (;;) { - sin.sin_port = htons (upper_limit); + sock_addr.sin_port = htons (upper_limit); if (ACE_OS::bind (handle, - ACE_reinterpret_cast(sockaddr *, &sin), - sizeof sin) >= 0) + ACE_reinterpret_cast(sockaddr *, &sock_addr), + sizeof sock_addr) >= 0) { #if defined (ACE_WIN32) upper_limit--; @@ -226,7 +226,7 @@ typedef long id_t; # define ACE_DEFAULT_RENDEZVOUS "/tmp/fifo.ace" # else # define ACE_DEFAULT_RENDEZVOUS "localhost:10010" -# endif /* ACE_LACKS_FIFO */ +# endif /* ACE_HAS_STREAM_PIPES */ # endif /* ACE_DEFAULT_RENDEZVOUS */ # if !defined (ACE_DEFAULT_LOGGER_KEY) diff --git a/ace/README b/ace/README index b828b7b888a..ad6b267dd02 100644 --- a/ace/README +++ b/ace/README @@ -626,8 +626,6 @@ ACE_LACKS_CONDATTR_PSHARED Platform has no implementation pthreads! ACE_LACKS_DIFFTIME Platform lacks difftime() implementation ACE_LACKS_FCNTL Platform lacks POSIX-style fcntl (). -ACE_LACKS_FIFO Platform lacks UNIX FIFOs - (e.g., Win32) ACE_LACKS_GETS Platform lacks ::gets (), or it's desired to ensure that it doesn't get used. Linux egcs diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 4c376d9ab57..0fb900b3b29 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -29,7 +29,6 @@ #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_MSGBUF_T #define ACE_LACKS_SYSV_SHMEM -#define ACE_LACKS_FIFO #define ACE_LACKS_UNISTD_H #define ACE_LACKS_RLIMIT |