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 */