Merged revisions 81106-81107,81110-81112,81116 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE

........
  r81106 | smcqueen | 2008-03-27 05:40:13 -0500 (Thu, 27 Mar 2008) | 1 line
  
  ChangeLogTag: Thu Mar 27 10:36:18 UTC 2008  Simon McQueen  <sm@prismtech.com>
........
  r81107 | johnnyw | 2008-03-27 06:12:42 -0500 (Thu, 27 Mar 2008) | 1 line
  
  Thu Mar 27 09:37:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81110 | elliott_c | 2008-03-27 07:39:06 -0500 (Thu, 27 Mar 2008) | 1 line
  
  ChangeLogTag: Thu Mar 27 12:37:18 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
........
  r81111 | elliott_c | 2008-03-27 07:47:00 -0500 (Thu, 27 Mar 2008) | 1 line
  
  ChangeLogTag: Thu Mar 27 12:46:48 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
........
  r81112 | johnnyw | 2008-03-27 07:54:21 -0500 (Thu, 27 Mar 2008) | 1 line
  
  Thu Mar 27 12:54:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81116 | johnnyw | 2008-03-27 08:46:35 -0500 (Thu, 27 Mar 2008) | 1 line
........

6 files changed, 58 insertions, 12 deletions

diff --git a/ACE/ASNMP/asnmp/snmperrs.h b/ACE/ASNMP/asnmp/snmperrs.h
index 7aafdc0619a..94739d7dd73 100644
--- a/ACE/ASNMP/asnmp/snmperrs.h
+++ b/ACE/ASNMP/asnmp/snmperrs.h
@@ -90,7 +90,7 @@
 
 // extras
 #define SNMP_CLASS_SHUTDOWN               -23 // used for back door shutdown
-#define SNMP_INVALID_ARGS                 -24  // invalid args passed
+#define SNMP_INVALID_ARGS                 -24 // invalid args passed
 
 #ifdef INCLUDE_SNMP_ERR_STRINGS_
 
@@ -121,6 +121,7 @@ static const char * pErrs[] = {
   "SNMP: Cannot perform operation, Authorization Error",      // 16
   "SNMP: Cannot create/set variable, Not Writable",           // 17
   "SNMP: Cannot create variable, Inconsistent Name",          // 18
+  "SNMP: Unknown error code",                                 // Always last
 };
 
 
@@ -202,7 +203,7 @@ static const char * nErrs[] = {
   "ASNMP: Blocked Mode Shutdown",
 
   // unknown error code
-  "Unknown error code",
+  "ASNMP: Unknown error code",
 };
 
 #endif //INCLUDE_SNMP_ERR_STRINGS_
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f6492b19ba1..33a4ec95f0f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,36 @@
+Thu Mar 27 12:54:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_vxworks6.3.GNU:
+          Small change to get the VxWorks shared library build further
+
+Thu Mar 27 12:46:48 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp:
+
+          Changed ACE_TMAIN to run_main for the non-threaded portion of the
+          #ifdef.  ACE_TMAIN is defined in Main.cpp.
+
+Thu Mar 27 12:37:18 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ASNMP/asnmp/snmperrs.h:
+
+          Added an unknown error code message to the pErrs array to avoid
+          getting a garbage pointer from Snmp::error_string() in the event
+          that the error code is outside the valid range.
+
+Thu Mar 27 11:11:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Free_List.cpp:
+          Fixed ambiguous else with GCC 4.3. Thanks to Jules Colding
+          <colding at 42tools dot com> for reporting this
+
+Thu Mar 27 10:36:18 UTC 2008  Simon McQueen  <sm@prismtech.com>
+
+        * include/makeinclude/wrapper_macros.GNU:
+
+          Make it possible to specify an alternate name / location for
+          platform_macros.GNU. This fixes bug #3269.
+
 Wed Mar 26 15:32:01 UTC 2008  Adam Mitz  <mitza@ociweb.com>
 
         * bin/MakeProjectCreator/templates/gnu.mpd:
diff --git a/ACE/ace/Free_List.cpp b/ACE/ace/Free_List.cpp
index 60dfabafb1c..ab38f55c2cb 100644
--- a/ACE/ace/Free_List.cpp
+++ b/ACE/ace/Free_List.cpp
@@ -115,11 +115,17 @@ ACE_Locked_Free_List<T, ACE_LOCK>::resize (size_t newsize)
 
   // Check if we are allowed to resize
   if (this->mode_ != ACE_PURE_FREE_LIST)
-    // Check to see if we grow or shrink
-    if (newsize < this->size_)
-      this->dealloc (this->size_ - newsize);
-    else
-      this->alloc (newsize - this->size_);
+    {
+      // Check to see if we grow or shrink
+      if (newsize < this->size_)
+        {
+          this->dealloc (this->size_ - newsize);
+        }
+      else
+        {
+          this->alloc (newsize - this->size_);
+        }
+    }
 }
 
 // Allocates <n> extra nodes for the freelist
diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU
index 7e086293f82..47a68e042d7 100644
--- a/ACE/include/makeinclude/platform_vxworks6.3.GNU
+++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU
@@ -247,9 +247,11 @@ ifeq ($(VXWORKSLINK), 1)
     PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS)
     ifeq ($(VX_SO_BUILD),1)
       ## Shared lib builds for VxWorks will also build 'import' libraries
-      LIB_INSTALL += $(VLIB:%=$(INSLIB)/%)
-      CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%)
-      REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize)
+      ifeq ($(rtp),1)
+        LIB_INSTALL += $(VLIB:%=$(INSLIB)/%)
+        CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%)
+        REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize)
+      endif
     endif
   else
     LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) $(LD_PARTIALFLAGS)
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index 41268e678e0..5f02503e6a5 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -275,7 +275,11 @@ SHR_FILTER ?=
 
 # Include this before the below variables to make it possible for
 # platform_macros.GNU to set default values for them.
-include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
+ifneq ($(alternate_platform_macros),)
+  include $(alternate_platform_macros)
+else
+  include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
+endif # alternate_platform_macros
 
 # Define some variables to silence warnings
 GHS ?=
diff --git a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
index 7f9bbd6c168..bf108d1b10a 100644
--- a/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
+++ b/ACE/tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp
@@ -341,7 +341,7 @@ run_main (int argc, ACE_TCHAR *argv[])
 
 #else
 int
-ACE_TMAIN (int, ACE_TCHAR *[])
+run_main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Thread_Pool_Reactor_SSL_Test"));