ChangeLogTag:Wed Mar 27 20:00:31 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>

7 files changed, 30 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e17e8de0f0..309884527da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 27 20:00:31 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* include/makeinclude/platform_linux.GNU: Fixed a typo where
+	  PLATFORM_XT_LDFLAGS was spelled incorrectly.  Thanks to 
+	  Eric Eide for reporting this.
+
 Wed Mar 27 18:36:14 2002  Krishnakumar B  <kitty@cs.wustl.edu>
 
         * include/makeinclude/platform_linux.GNU (CXX_VERSION):
@@ -54,6 +60,7 @@ Wed Mar 27 15:10:27 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* tests/icc.bat: Removed duplicates.
 
+>>>>>>> 4.3319
 Wed Mar 27 10:25:12 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/High_Res_Timer.{h,cpp}:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 4e17e8de0f0..309884527da 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Wed Mar 27 20:00:31 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* include/makeinclude/platform_linux.GNU: Fixed a typo where
+	  PLATFORM_XT_LDFLAGS was spelled incorrectly.  Thanks to 
+	  Eric Eide for reporting this.
+
 Wed Mar 27 18:36:14 2002  Krishnakumar B  <kitty@cs.wustl.edu>
 
         * include/makeinclude/platform_linux.GNU (CXX_VERSION):
@@ -54,6 +60,7 @@ Wed Mar 27 15:10:27 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* tests/icc.bat: Removed duplicates.
 
+>>>>>>> 4.3319
 Wed Mar 27 10:25:12 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/High_Res_Timer.{h,cpp}:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 4e17e8de0f0..309884527da 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Wed Mar 27 20:00:31 2002  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
+
+	* include/makeinclude/platform_linux.GNU: Fixed a typo where
+	  PLATFORM_XT_LDFLAGS was spelled incorrectly.  Thanks to 
+	  Eric Eide for reporting this.
+
 Wed Mar 27 18:36:14 2002  Krishnakumar B  <kitty@cs.wustl.edu>
 
         * include/makeinclude/platform_linux.GNU (CXX_VERSION):
@@ -54,6 +60,7 @@ Wed Mar 27 15:10:27 2002  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* tests/icc.bat: Removed duplicates.
 
+>>>>>>> 4.3319
 Wed Mar 27 10:25:12 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/High_Res_Timer.{h,cpp}:
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index 6ce6970f413..79f49178f5a 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -75,8 +75,8 @@ public:
     /// set various stream head options
     MB_SETOPTS  = 0x08,
 
-    // = Control messag
-    /// acknowledge ioctles (high priority; go to head of queue)
+    // = Control messages
+    /// acknowledge ioctl (high priority; go to head of queue)
     MB_IOCACK   = 0x81,
     /// negative ioctl acknowledge
     MB_IOCNAK   = 0x82,
@@ -308,7 +308,6 @@ public:
   /// Return a "shallow" copy that increments our reference count by 1.
   ACE_Message_Block *duplicate (void) const;
 
-
   /**
    * Return a "shallow" copy that increments our reference count by 1.
    * This is similar to CORBA's <_duplicate> method, which is useful
@@ -317,7 +316,6 @@ public:
    */
   static ACE_Message_Block *duplicate (const ACE_Message_Block *mb);
 
-
   /**
    * Decrease the shared ACE_Data_Block's reference count by 1.  If the
    * ACE_Data_Block's reference count goes to 0, it is deleted.
@@ -352,7 +350,6 @@ public:
    */
   static ACE_Message_Block *release (ACE_Message_Block *mb);
 
-
   // = Operations on Message data
 
   /**
diff --git a/ace/Module.cpp b/ace/Module.cpp
index e21b2cc49a6..51b4540b83e 100644
--- a/ace/Module.cpp
+++ b/ace/Module.cpp
@@ -178,10 +178,10 @@ ACE_Module<ACE_SYNCH_USE>::~ACE_Module (void)
 
 template <ACE_SYNCH_DECL>
 ACE_Module<ACE_SYNCH_USE>::ACE_Module (const ACE_TCHAR *mod_name,
-                                     ACE_Task<ACE_SYNCH_USE> *writer_q,
-                                     ACE_Task<ACE_SYNCH_USE> *reader_q,
-                                     void *args,
-                                     int flags /* = M_DELETE */)
+                                       ACE_Task<ACE_SYNCH_USE> *writer_q,
+                                       ACE_Task<ACE_SYNCH_USE> *reader_q,
+                                       void *args,
+                                       int flags /* = M_DELETE */)
   : flags_ (0)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::ACE_Module");
@@ -215,7 +215,7 @@ ACE_Module<ACE_SYNCH_USE>::close (int flags /* = M_DELETE_NONE */)
 
 template <ACE_SYNCH_DECL> int
 ACE_Module<ACE_SYNCH_USE>::close_i (int which,
-                                  int flags)
+                                    int flags)
 {
   ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::close_i");
 
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index f72ebd4acfb..a48803faa8f 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -426,7 +426,7 @@ ACE_Stream<ACE_SYNCH_USE>::close (int flags)
 
 template <ACE_SYNCH_DECL> int
 ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
-                                  void *a)
+                                    void *a)
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::control");
   ACE_IO_Cntl_Msg ioc (cmd);
diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index 4bd65e7b4fd..c33af9cc4ab 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -27,7 +27,7 @@ endif # threads
 
 PLATFORM_XT_CPPFLAGS=
 PLATFORM_XT_LIBS=-lXt
-LATFORM_XT_LDFLAGS=
+PLATFORM_XT_LDFLAGS=
 
 PLATFORM_FL_CPPFLAGS=
 PLATFORM_FL_LIBS=-lfltk