diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-10 13:58:46 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-08-10 13:58:46 +0000 |
| commit | 17fa070fa4e711ded8d46b4e5871a47a314d618f (patch) | |
| tree | 23a0d704fa41d99a07bf7809d15c87cd0c4bc3f6 | |
| parent | 4bfbc6f7e7200b608e82e492ad8f012f3fe421cc (diff) | |
| download | ATCD-17fa070fa4e711ded8d46b4e5871a47a314d618f.tar.gz | |
ChangeLogTag: Tue Aug 10 14:00:00 UTC 2004 Simon Massey <simon.massey@prismtechnologies.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ace/FIFO_Send_Msg.h | 8 | ||||
| -rw-r--r-- | ace/FILE_IO.h | 8 |
3 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 7ce05e89d64..4e2ca08cda0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Aug 10 14:00:00 UTC 2004 Simon Massey <simon.massey@prismtechnologies.com> + + I shouldn't have been rushed into these guarded #includes. The following + two files now need these guarded #includes to be moved after the rest. + + * ace/FILE_IO.h + * ace/FIFO_Send_Msg.h + Moved guarded #include "ace/OS_NS_stropts.h" to end of other #includes + Tue Aug 10 11:20:00 UTC 2004 Simon Massey <simon.massey@prismtechnologies.com> * examples/IOStream/server/iostream_server.cpp diff --git a/ace/FIFO_Send_Msg.h b/ace/FIFO_Send_Msg.h index d06f32ab309..b7f0e104177 100644 --- a/ace/FIFO_Send_Msg.h +++ b/ace/FIFO_Send_Msg.h @@ -15,16 +15,16 @@ #define ACE_FIFO_SEND_MSG_H #include /**/ "ace/pre.h" -#if defined (ACE_HAS_STREAM_PIPES) -# include "ace/OS_NS_stropts.h" -#endif /* ACE_HAS_STREAM_PIPES */ - #include "ace/FIFO_Send.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#if defined (ACE_HAS_STREAM_PIPES) +# include "ace/OS_NS_stropts.h" +#endif /* ACE_HAS_STREAM_PIPES */ + // Forward Decls class ACE_Str_Buf; diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h index e01e8cc0c76..0bc7c98e187 100644 --- a/ace/FILE_IO.h +++ b/ace/FILE_IO.h @@ -14,10 +14,6 @@ #define ACE_FILE_IO_H #include /**/ "ace/pre.h" -#if defined (ACE_HAS_STREAM_PIPES) -# include "ace/OS_NS_stropts.h" -#endif /* ACE_HAS_STREAM_PIPES */ - #include "ace/FILE.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -30,6 +26,10 @@ #include "ace/os_include/os_stdio.h" #include "ace/os_include/sys/os_uio.h" +#if defined (ACE_HAS_STREAM_PIPES) +# include "ace/OS_NS_stropts.h" +#endif /* ACE_HAS_STREAM_PIPES */ + // Forward decl. class ACE_Message_Block; class ACE_Time_Value; |