From 5b4b8f8899c7bfccbc6949deb5ae2cb862a4897d Mon Sep 17 00:00:00 2001
From: Shiqing Fan <shiqing@hlrs.de>
Date: Fri, 26 Jun 2009 07:51:39 +0000
Subject: [PATCH] Get rid of a bunch of compiler warnings on Windows.

This commit was SVN r21536.
---
 ompi/include/ompi/memchecker.h            |  6 ++++--
 orte/mca/plm/process/plm_process_module.c | 24 +++++++++++------------
 orte/mca/ras/ccp/ras_ccp_component.c      |  1 -
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ompi/include/ompi/memchecker.h b/ompi/include/ompi/memchecker.h
index 7b92020b3e..cbcf8dbb38 100644
--- a/ompi/include/ompi/memchecker.h
+++ b/ompi/include/ompi/memchecker.h
@@ -47,7 +47,8 @@ static inline int memchecker_convertor_call (int (*f)(void *, size_t), ompi_conv
         f( (void *)pConvertor->pBaseBuf , pConvertor->local_size);
     } else {
         /* Now we got a noncontigous data. */
-        uint32_t         stack_disp  = 0, elem_pos = 0, i;
+        uint32_t elem_pos = 0, i;
+        ptrdiff_t  stack_disp  = 0;
         dt_elem_desc_t*  description = pConvertor->use_desc->desc;
         dt_elem_desc_t*  pElem       = &(description[elem_pos]);
         unsigned char   *source_base = pConvertor->pBaseBuf;
@@ -96,7 +97,8 @@ static inline int memchecker_call (int (*f)(void *, size_t), void * addr,
         f( addr , datatype->size * count );
     } else {
         /* Now we got a noncontigous type. */
-        uint32_t         stack_disp  = 0, elem_pos = 0, i;
+        uint32_t         elem_pos = 0, i;
+        ptrdiff_t        stack_disp  = 0;
         dt_elem_desc_t*  description = datatype->opt_desc.desc;
         dt_elem_desc_t*  pElem       = &(description[elem_pos]);
         unsigned char   *source_base = (unsigned char *) addr;
diff --git a/orte/mca/plm/process/plm_process_module.c b/orte/mca/plm/process/plm_process_module.c
index bc2dadc455..a23e089649 100644
--- a/orte/mca/plm/process/plm_process_module.c
+++ b/orte/mca/plm/process/plm_process_module.c
@@ -28,18 +28,6 @@
 
 #define _WIN32_DCOM
 
-#include <winsock2.h>
-#include <comutil.h>
-#include <Wbemidl.h>
-#include <wincred.h>
-#include <stdio.h>
-#include <conio.h>
-#include <wincred.h> 
-
-#pragma comment(lib, "wbemuuid.lib")
-#pragma comment(lib, "comsuppw.lib")
-#pragma comment(lib, "Credui.lib")
-
 #include "orte_config.h"
 #include "orte/constants.h"
 
@@ -71,6 +59,18 @@
 #include <pwd.h>
 #endif
 
+#include <winsock2.h>
+#include <comutil.h>
+#include <Wbemidl.h>
+#include <wincred.h>
+#include <stdio.h>
+#include <conio.h>
+#include <wincred.h> 
+
+#pragma comment(lib, "wbemuuid.lib")
+#pragma comment(lib, "comsuppw.lib")
+#pragma comment(lib, "Credui.lib")
+
 #include "opal/mca/installdirs/installdirs.h"
 #include "opal/mca/base/mca_base_param.h"
 #include "opal/util/output.h"
diff --git a/orte/mca/ras/ccp/ras_ccp_component.c b/orte/mca/ras/ccp/ras_ccp_component.c
index 311a8d1c89..e71e16e9ab 100644
--- a/orte/mca/ras/ccp/ras_ccp_component.c
+++ b/orte/mca/ras/ccp/ras_ccp_component.c
@@ -84,7 +84,6 @@ static int ras_ccp_open(void)
 
 static int orte_ras_ccp_component_query(mca_base_module_t **module, int *priority)
 {
-    int rc;
     ICluster* pCluster = NULL;
     HRESULT hr = S_OK;