diff options
author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-22 02:52:30 +0000 |
---|---|---|
committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-05-22 02:52:30 +0000 |
commit | f8e5d94ceae7cbe173a39c0ea993977771cb6c4e (patch) | |
tree | c9586b0b38b8179bc6f92792ce079d1fb5217c0d /ace/os_include/stropts.h | |
parent | cac4707bbbf6b80d7e88d84a0e76d2078236445c (diff) | |
download | ATCD-dre_osh_03.tar.gz |
ChangeLogTag:Thu May 22 02:28:28 UTC 2003 Don Hinton <dhinton@dresystems.com>dre_osh_03
Diffstat (limited to 'ace/os_include/stropts.h')
-rw-r--r-- | ace/os_include/stropts.h | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/ace/os_include/stropts.h b/ace/os_include/stropts.h index 55f47a6d264..5bbc0111eb9 100644 --- a/ace/os_include/stropts.h +++ b/ace/os_include/stropts.h @@ -2,19 +2,19 @@ //============================================================================= /** - * @file stropts.h + * @file os_stropts.h * * STREAMS interface (STREAMS) * * $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_STROPTS_H -#define ACE_OS_INCLUDE_STROPTS_H +#ifndef ACE_OS_INCLUDE_OS_STROPTS_H +#define ACE_OS_INCLUDE_OS_STROPTS_H #include "ace/pre.h" @@ -26,9 +26,47 @@ #include "ace/os_include/unistd.h" +#if defined (ACE_HAS_TIMOD_H) +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# define queue _Queue_ +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ +# include /**/ <sys/timod.h> +# if defined (ACE_HAS_STL_QUEUE_CONFLICT) +# undef queue +# endif /* ACE_HAS_STL_QUEUE_CONFLICT */ +#elif defined (ACE_HAS_OSF_TIMOD_H) +# include /**/ <tli/timod.h> +#endif /* ACE_HAS_TIMOD_H */ + +#if !defined (ACE_LACKS_SYS_IOCTL_H) +# include /**/ <sys/ioctl.h> +#endif /* !ACE_LACKS_IOCTL_H */ + +#if defined (ACE_HAS_SYS_FILIO_H) +# include /**/ <sys/filio.h> +#endif /* ACE_HAS_SYS_FILIO_H */ + +#if defined (ACE_HAS_SOCKIO_H) +# include /**/ <sys/sockio.h> +#endif /* ACE_HAS_SOCKIO_ */ + #if !defined (ACE_LACKS_STROPTS_H) -# include /**/ <stropts.h> +# include /**/ <stropts.h> #endif /* !ACE_LACKS_STROPTS_H */ +// Place all additions (especially function declarations) within extern "C" {} +#ifdef __cplusplus +extern "C" +{ +#endif /* __cplusplus */ + +#if defined (ACE_LACKS_STRRECVFD) + struct strrecvfd {}; +#endif /* ACE_LACKS_STRRECVFD */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #include "ace/post.h" -#endif /* ACE_OS_INCLUDE_STROPTS_H */ +#endif /* ACE_OS_INCLUDE_OS_STROPTS_H */ |