diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-07-01 10:27:10 +0200 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-08-11 08:40:19 -0500 |
| commit | eb32126b750d7ce4aa9221023fdd874ffac37a53 (patch) | |
| tree | c286b05c9e21a1e186116a5a479426c171cdccfa /ACE | |
| parent | 53d05cb13ec0850f0c018c4967c3aecf7a9d03c0 (diff) | |
| download | ATCD-eb32126b750d7ce4aa9221023fdd874ffac37a53.tar.gz | |
Merge pull request #1872 from jwillemsen/jwi-vxworks
Fixed VxWorks compile error and minor cleanup
(cherry picked from commit e35823e1811b6e38c0b175b4d238c7d9599e6c4e)
# Conflicts:
# ACE/ace/OS_NS_unistd.inl
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/OS_NS_sys_socket.inl | 4 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_unistd.inl | 2 | ||||
| -rw-r--r-- | ACE/ace/SOCK_Dgram_Mcast.cpp | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks.GNU | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 3da4104198e..1217c629ce8 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -1063,8 +1063,10 @@ ACE_OS::if_freenameindex (struct if_nameindex *ptr) #ifdef ACE_LACKS_IF_NAMEINDEX ACE_UNUSED_ARG (ptr); #else - if (ptr != 0) + if (ptr) + { ::if_freenameindex (ptr); + } #endif /* ACE_LACKS_IF_NAMEINDEX */ } diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 035f19baf11..8920267954c 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -780,7 +780,7 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len) ssize_t result; # if defined (ACE_HAS_CHARPTR_SOCKOPT) - ACE_OSCALL (::read (handle, static_cast <char *> (buf), len), ssize_t, -1, result); + ACE_OSCALL (::read (handle, static_cast <char *> (buf), len), ssize_t, result); # else ACE_OSCALL (::read (handle, buf, len), ssize_t, -1, result); # endif /* ACE_HAS_CHARPTR_SOCKOPT */ diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp index cfaab1fcba2..4b669591a4f 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.cpp +++ b/ACE/ace/SOCK_Dgram_Mcast.cpp @@ -626,10 +626,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, { size_t nr_unsubscribed = 0; # if defined(ACE_LINUX) - - struct if_nameindex *intf; - - intf = ACE_OS::if_nameindex (); + struct if_nameindex *intf = ACE_OS::if_nameindex (); if (intf == 0) return -1; diff --git a/ACE/include/makeinclude/platform_vxworks.GNU b/ACE/include/makeinclude/platform_vxworks.GNU index ffdcd18d159..b04de7654f9 100644 --- a/ACE/include/makeinclude/platform_vxworks.GNU +++ b/ACE/include/makeinclude/platform_vxworks.GNU @@ -4,7 +4,7 @@ ifeq (,$(WIND_PLATFORM)) default: @ERROR: you must set your WIND_PLATFORM environment variable -endif # WIND_BASE +endif # WIND_PLATFORM ifeq (vxworks-6.2, $(findstring vxworks-6.2,$(WIND_PLATFORM))) include $(ACE_ROOT)/include/makeinclude/platform_vxworks6.2.GNU |