diff options
Diffstat (limited to 'ace/os_include/arpa/inet.h')
| -rw-r--r-- | ace/os_include/arpa/inet.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/ace/os_include/arpa/inet.h b/ace/os_include/arpa/inet.h index 86e583af18f..6266a760585 100644 --- a/ace/os_include/arpa/inet.h +++ b/ace/os_include/arpa/inet.h @@ -2,19 +2,19 @@ //============================================================================= /** - * @file inet.h + * @file os_inet.h * * definitions for internet operations * * $Id$ * - * @author Don Hinton <dhinton@ieee.org> + * @author Don Hinton <dhinton@dresystems.com> * @author This code was originally in various places including ace/OS.h. */ //============================================================================= -#ifndef ACE_OS_INCLUDE_ARPA_INET_H -#define ACE_OS_INCLUDE_ARPA_INET_H +#ifndef ACE_OS_INCLUDE_ARPA_OS_INET_H +#define ACE_OS_INCLUDE_ARPA_OS_INET_H #include "ace/pre.h" @@ -27,10 +27,22 @@ #include "ace/os_include/netinet/in.h" #if !defined (ACE_LACKS_ARPA_INET_H) -# include /**/ <arpa/inet.h> + extern "C" { +# include /**/ <arpa/inet.h> + } #endif /* !ACE_LACKS_ARPA_INET_H */ +// Place all additions (especially function declarations) within extern "C" {} +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + // @todo move the ACE_HTONL, etc macros here +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #include "ace/post.h" -#endif /* ACE_OS_INCLUDE_ARPA_INET_H */ +#endif /* ACE_OS_INCLUDE_ARPA_OS_INET_H */ |