diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-04-12 17:59:35 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-04-12 17:59:35 +0000 |
| commit | 377df8edd11f1e4171b20540f1c043b032d13fe0 (patch) | |
| tree | c5e2436b21592f0828fd3eeb6ae8d38b032335d2 | |
| parent | 1ee7dbb58860bb77eed2bcf20264165e0a0dfee7 (diff) | |
| download | ATCD-377df8edd11f1e4171b20540f1c043b032d13fe0.tar.gz | |
ChangeLogTag:Fri Apr 12 18:00:41 UTC 2002 Don Hinton <dhinton@ieee.org>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/Basic_Types.h | 6 | ||||
| -rw-r--r-- | ace/Log_Msg.h | 2 |
5 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 2e4c4b5548f..e2d38ad68fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 12 18:00:41 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/Log_Msg.h: Added missing includes. + + * ace/Basic_Types.h: Removed erroneous ENOMEM definition. + Fri Apr 12 10:02:58 2002 Priyanka Gontla <pgontla@ece.uci.edu> * ace/Based_Pointer_T.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 2e4c4b5548f..e2d38ad68fe 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Fri Apr 12 18:00:41 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/Log_Msg.h: Added missing includes. + + * ace/Basic_Types.h: Removed erroneous ENOMEM definition. + Fri Apr 12 10:02:58 2002 Priyanka Gontla <pgontla@ece.uci.edu> * ace/Based_Pointer_T.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 2e4c4b5548f..e2d38ad68fe 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Fri Apr 12 18:00:41 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/Log_Msg.h: Added missing includes. + + * ace/Basic_Types.h: Removed erroneous ENOMEM definition. + Fri Apr 12 10:02:58 2002 Priyanka Gontla <pgontla@ece.uci.edu> * ace/Based_Pointer_T.h: diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index f251a890d70..1d00da0d5c4 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -659,12 +659,6 @@ typedef ACE_UINT16 ACE_USHORT16; typedef int ssize_t; #endif /* ACE_HAS_SSIZE_T */ -// This doesn't belong here, but the bigger fix isn't ready to commit. -# if !defined (ENOMEM) -# define ENOMEM 12 /* Not enough core */ -# endif /* ENOMEM */ - - # if defined (__ACE_INLINE__) # include "ace/Basic_Types.i" # endif /* __ACE_INLINE__ */ diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index 931829c2f4e..b6be86b1d5b 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -19,9 +19,11 @@ // ... but ACE_NDEBUG and ACE_NLOGGING can come from the config.h file, so // pull that one early. #include "ace/config-all.h" +#include "ace/Global_Macros.h" #include "ace/Default_Constants.h" #include "ace/Log_Priority.h" #include "ace/Basic_Types.h" +#include "ace/OS_Errno.h" // The following ASSERT macro is courtesy of Alexandre Karev // <akg@na47sun05.cern.ch>. |