3 files changed, 15 insertions, 5 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 21a96fcb14..7e318bce73 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -676,6 +676,11 @@ include (ssl.cmake)
 # Check for syslog capabilities not present on all systems
 check_symbol_exists (LOG_AUTHPRIV "sys/syslog.h" HAVE_LOG_AUTHPRIV)
 check_symbol_exists (LOG_FTP "sys/syslog.h" HAVE_LOG_FTP)
+  
+# Set default Memory Status module (Null implementation)
+set (qpid_memstat_module
+  qpid/sys/MemStat.cpp
+)
 
 # Allow MSVC user to select 'WinXP-SP3/Windows Server 2003' as build target version
 set (win32_winnt_default OFF)
@@ -738,7 +743,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
     qpid/sys/windows/SystemInfo.cpp
     qpid/sys/windows/Thread.cpp
     qpid/sys/windows/Time.cpp
-    qpid/sys/windows/MemStat.cpp
     qpid/client/windows/SaslFactory.cpp
     ${sslcommon_windows_SOURCES}
   )
@@ -795,6 +799,10 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
     if (CMAKE_COMPILER_IS_GNUCXX)
       set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_CATCH_UNDEFINED} -pthread")
     endif (CMAKE_COMPILER_IS_GNUCXX)
+    # On Linux override memory status module
+    set (qpid_memstat_module
+      qpid/sys/posix/MemStat.cpp
+    ) 
   endif (CMAKE_SYSTEM_NAME STREQUAL Linux)
 
   if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
@@ -802,7 +810,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
     set (qpid_system_module
       qpid/sys/solaris/SystemInfo.cpp
     )
-#   On Sun we want -lpthread -lthread as the 2nd last and last libs passed to linker
+    # On Sun we want -lpthread -lthread as the 2nd last and last libs passed to linker
     set (qpidtypes_platform_LIBS ${qpidtypes_platform_LIBS}
       pthread
       thread
@@ -821,7 +829,6 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
     qpid/sys/posix/FileSysDir.cpp
     qpid/sys/posix/IOHandle.cpp
     qpid/sys/posix/LockFile.cpp
-    qpid/sys/posix/MemStat.cpp
     qpid/sys/posix/Mutex.cpp
     qpid/sys/posix/PipeHandle.cpp
     qpid/sys/posix/PollableCondition.cpp
@@ -924,6 +931,7 @@ set (qpidcommon_SOURCES
      qpid/sys/Timer.cpp
      qpid/sys/TimerWarnings.cpp
      qpid/amqp_0_10/Codecs.cpp
+     ${qpid_memstat_module}
 )
 add_msvc_version (qpidcommon library dll)
 
diff --git a/qpid/cpp/src/qpid/sys/windows/MemStat.cpp b/qpid/cpp/src/qpid/sys/MemStat.cpp
index b1d25c5fc5..c71fba785c 100644
--- a/qpid/cpp/src/qpid/sys/windows/MemStat.cpp
+++ b/qpid/cpp/src/qpid/sys/MemStat.cpp
@@ -21,9 +21,11 @@
 
 #include "qpid/sys/MemStat.h"
 
+// Null memory stats provider:
+// This is for platforms that do not have a way to get allocated
+// memory status
 void qpid::sys::MemStat::loadMemInfo(qmf::org::apache::qpid::broker::Memory*)
 {
-    // TODO: Add Windows-specific memory stats to the object and load them here.
 }
 
 
diff --git a/qpid/cpp/src/qpid/sys/posix/MemStat.cpp b/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
index 72c53e5886..2fbf119cab 100644
--- a/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "qpid/sys/MemStat.h"
+
 #include <malloc.h>
 
 void qpid::sys::MemStat::loadMemInfo(qmf::org::apache::qpid::broker::Memory* object)
@@ -35,4 +36,3 @@ void qpid::sys::MemStat::loadMemInfo(qmf::org::apache::qpid::broker::Memory* obj
     object->set_malloc_keepcost(info.keepcost);
 }
 
-