ChangeLogTag:Sun Nov 2 15:58:23 UTC 2003 Don Hinton <dhinton@dresystems.com>

6 files changed, 35 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index e722c821b00..60f3eeac075 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Sun Nov  2 15:58:23 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/ace.mpc:
+          Added a comment about footprint and compile times, and moved the
+          commented out files up--MPC doesn't like comments in file
+          lists.  Thanks to Johnny Willemsen <jwillemsen@remedy.nl>
+          for reporting this.
+
+        * ace/OS_NS_netdb.inl:
+          Fixed a couple of instances of ::memcpy that didn't include
+          ACE_OS.
+
+        * ace/_S_NS_netdb.cpp:
+          Added #include Object_Manager_Base.h.
+
+        * ace/OS_NS_unistd.cpp:
+          Added #include Object_Manager_Base.h and OS_NS_Thread.h.
+
+        * ace/OS_NS_time.inl:
+          Added #include OS_NS_sys_time.h.
+
 Sun Nov  2 12:55:21 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Shared_Memory.h:
diff --git a/ace/OS_NS_netdb.cpp b/ace/OS_NS_netdb.cpp
index ccd51c84270..a66b262a7d2 100644
--- a/ace/OS_NS_netdb.cpp
+++ b/ace/OS_NS_netdb.cpp
@@ -342,6 +342,7 @@ ACE_OS::getmacaddress (struct macaddr_node_t *node)
 
 # if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
 #   include "ace/OS_NS_Thread.h"
+#   include "ace/Object_Manager_Base.h"
 int
 ACE_OS::netdb_acquire (void)
 {
diff --git a/ace/OS_NS_netdb.inl b/ace/OS_NS_netdb.inl
index 62ca9c182bc..19b201804c8 100644
--- a/ace/OS_NS_netdb.inl
+++ b/ace/OS_NS_netdb.inl
@@ -17,7 +17,7 @@
         TYPE ace_result_; \
         ACE_OSCALL (OP, TYPE, FAILVALUE, ace_result_); \
         if (ace_result_ != FAILVALUE) \
-          ::memcpy (TARGET, \
+          ACE_OS::memcpy (TARGET, \
                     ace_result_, \
                     SIZE < sizeof (TYPE) ? SIZE : sizeof (TYPE)); \
         ACE_OS::netdb_release (); \
@@ -31,7 +31,7 @@
         TYPE ace_result_; \
         ACE_OSCALL(OP,TYPE,FAILVALUE,ace_result_); \
         if (ace_result_ != FAILVALUE) \
-          ::memcpy (TARGET, \
+          ACE_OS::memcpy (TARGET, \
                     ace_result_, \
                     SIZE < sizeof (TYPE) ? SIZE : sizeof (TYPE)); \
         return ace_result_; \
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index dc5ba491912..acd96e294a1 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -5,6 +5,7 @@
 #include "ace/OS_NS_errno.h"
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/OS_NS_sys_time.h"
 
 ACE_INLINE char *
 ACE_OS::asctime (const struct tm *t)
diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp
index 56f31b83cf1..714518dc4d1 100644
--- a/ace/OS_NS_unistd.cpp
+++ b/ace/OS_NS_unistd.cpp
@@ -14,7 +14,8 @@ ACE_RCSID(ace, OS_NS_unistd, "$Id$")
 #include "ace/OS_NS_ctype.h"
 #include "ace/Default_Constants.h"
 #include "ace/OS_Memory.h"
-#include "ace/Guard_T.h"
+#include "ace/OS_NS_Thread.h"
+#include "ace/Object_Manager_Base.h"
 
 #if defined (ACE_NEEDS_FTRUNCATE)
 extern "C" int
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 511c0a01491..6ad0c6fcabf 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -10,14 +10,18 @@ project(ACE) : acedefaults, aceversion, core, qt_moc, qt_reactor {
   // This mpc file could be greatly simplified by putting the separate components
   // in subdirectories. 
 
+  // Old OS files.  put these back and remove the OS_NS*, Cleanup.cpp, and
+  // Object_Manager_Base.cpp to improve compile times at the cost of
+  // footprint. dhinton
+  //OS.cpp
+  //OS_Dirent.cpp
+  //OS_Memory.cpp
+  //OS_String.cpp
+
   Source_Files(ACE_COMPONENTS) {
     OS {
       Basic_Types.cpp
       Time_Value.cpp
-      //OS.cpp
-      //OS_Dirent.cpp
-      //OS_Memory.cpp
-      //OS_String.cpp
       Cleanup.cpp
       Object_Manager_Base.cpp
       OS_NS_arpa_inet.cpp