diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-10-05 09:02:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 09:02:06 +0200 |
| commit | 0c80d3a8a65178b808e31d7f4b29fc551ed872a6 (patch) | |
| tree | b5c93174e69459f7fecd8c47ed58facf4b74c5ad | |
| parent | 320486a79260766c61512cc2217a805d915d3106 (diff) | |
| parent | 9b8f769e30b631baee892fee94a89ea4208a5cc2 (diff) | |
| download | ATCD-0c80d3a8a65178b808e31d7f4b29fc551ed872a6.tar.gz | |
Merge pull request #1955 from jwillemsen/jwi-vxworksdefines
Moved VxWorks define to os_netdb.h
| -rw-r--r-- | ACE/ace/os_include/os_netdb.h | 9 | ||||
| -rw-r--r-- | ACE/ace/os_include/os_unistd.h | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ACE/ace/os_include/os_netdb.h b/ACE/ace/os_include/os_netdb.h index 320e8f191b4..7bde5e92228 100644 --- a/ACE/ace/os_include/os_netdb.h +++ b/ACE/ace/os_include/os_netdb.h @@ -36,6 +36,15 @@ extern "C" # include /**/ <netdb.h> #endif /* !ACE_LACKS_NETDB_H */ +#if defined (ACE_VXWORKS) +# include /**/ <hostLib.h> +# if (ACE_VXWORKS <= 0x700) || defined (GETHOSTBYNAME_REENTRANT) +// With VxWorks 7 hostLib.h defines GETHOSTBYNAME_REENTRANT when gethostbyname() +// is reentrant +# define ACE_VXWORKS_HAS_GETHOSTBYNAME_REENTRANT +# endif +#endif /* ACE_VXWORKS */ + #if defined (ACE_LACKS_HOSTENT) struct hostent { char *h_name; /* official name of host */ diff --git a/ACE/ace/os_include/os_unistd.h b/ACE/ace/os_include/os_unistd.h index d56d1b30d30..db6275d0026 100644 --- a/ACE/ace/os_include/os_unistd.h +++ b/ACE/ace/os_include/os_unistd.h @@ -49,11 +49,6 @@ # endif // for gethostname() # include /**/ <hostLib.h> -# if (ACE_VXWORKS <= 0x700) || defined (GETHOSTBYNAME_REENTRANT) -// With VxWorks 7 hostLib.h defines GETHOSTBYNAME_REENTRANT when gethostbyname() -// is reentrant -# define ACE_VXWORKS_HAS_GETHOSTBYNAME_REENTRANT -# endif #endif /* ACE_VXWORKS */ #ifdef ACE_MQX |