diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-24 07:57:00 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-24 07:57:00 +0000 |
commit | 814a649fc10af56263b10b2f14cb1f5660517bfa (patch) | |
tree | 6900d2cd5befb13ad7c0a8dd00028e017f452d27 /ace/OS.h | |
parent | 9efb9ddd35d2aa151a57ec695cb40a27acc100a4 (diff) | |
download | ATCD-814a649fc10af56263b10b2f14cb1f5660517bfa.tar.gz |
ChangeLogTag: Fri Jan 24 07:53:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/OS.h')
-rw-r--r-- | ace/OS.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3225,15 +3225,15 @@ extern "C" # undef queue # endif /* ACE_HAS_STL_QUEUE_CONFLICT */ -# if defined (VXWORKS) +# if defined (ACE_VXWORKS) && ACE_VXWORKS <= 0x540 // Work around a lack of ANSI prototypes for these functions on VxWorks. unsigned long inet_addr (const char *); char *inet_ntoa (const struct in_addr); struct in_addr inet_makeaddr (const int, const int); unsigned long inet_network (const char *); -# else /* ! VXWORKS */ +# else /* ! (ACE_VXWORKS) && ACE_VXWORKS <= 0x540 */ # include /**/ <arpa/inet.h> -# endif /* ! VXWORKS */ +# endif /* ! (ACE_VXWORKS) && ACE_VXWORKS <= 0x540 */ } # if !defined (ACE_LACKS_TCP_H) # if defined(ACE_HAS_CONFLICTING_XTI_MACROS) |