Fix a few things for Windows build - type cast, modified variable names and unresolved symbols.

This commit was SVN r23783.

contrib/platform/win32/CMakeModules/ompi_configure.cmake

@@ -184,9 +184,9 @@ OPAL_WITH_OPTION_MIN_MAX_VALUE(datarep_string 128 64 256)
 
 OMPI_DEF_CACHE_VAR(OMPI_MPIEXT_COMPONENTS none STRING "Specify user defined MPI Extended Interface Components." 1 1)
 
-OMPI_DEF_OPT(MCA_mtl_DIRECT_CALL "Whether mtl should use direct calls instead of components." OFF)
+OMPI_DEF_OPT(MCA_ompi_mtl_DIRECT_CALL "Whether mtl should use direct calls instead of components." OFF)
 
-OMPI_DEF_OPT(MCA_pml_DIRECT_CALL "Whether pml should use direct calls instead of components." OFF)
+OMPI_DEF_OPT(MCA_ompi_pml_DIRECT_CALL "Whether pml should use direct calls instead of components." OFF)
 
 OMPI_DEF_OPT(MPI_PARAM_CHECK "Whether we want to check MPI parameters always, never, or decide at run-time." OFF)
 
@@ -252,6 +252,8 @@ OMPI_DEF_OPT(ORTE_WANT_NOTIFIER_LOG_EVENT "if the notifier_log_event should be e
 
 OMPI_DEF_OPT(OMPI_WANT_OFED "Whether we want to enable OFED support." ON)
 
+OMPI_DEF_OPT(OMPI_WANT_WINVERBS "Whether we want to enable Winverbs support." ON)
+
 OMPI_DEF_OPT(OPAL_ENABLE_CRDEBUG "Whether we want checkpoint/restart enabled debugging functionality or not." OFF)
 
 IF (NOT MSVC)
@@ -727,6 +729,8 @@ IF(WIN32)
 
   OMPI_DEF_CACHE(MCA_pml_DIRECT_CALL_HEADER " " STRING "Header pml includes to be direct called." 1 1)
 
+  OMPI_DEF_CACHE(OMPI_MPI_CONTRIBS none STRING "List of contributed package names that will be built." 1 1)
+
   CHECK_C_INLINE()
 
 ENDIF(WIN32)

ompi/mca/pml/v/.windows

@@ -0,0 +1,12 @@
+#
+# Copyright (c)      2010 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# Specific to this module
+mca_link_libraries=libmpi libopen-rte

ompi/mca/pml/v/Makefile.am

@@ -13,6 +13,8 @@
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
 
+EXTRA_DIST = .windows
+
 local_sources = \
         pml_v.c \
         pml_v.h \

ompi/mca/vprotocol/base/vprotocol_base_select.c

@@ -84,7 +84,7 @@ int mca_vprotocol_base_select(bool enable_progress_threads,
             best_module = module;
         }
             
-        om = malloc(sizeof(opened_component_t));
+        om = (opened_component_t *) malloc(sizeof(opened_component_t));
         if (NULL == om) return OMPI_ERR_OUT_OF_RESOURCE;
         OBJ_CONSTRUCT(om, opal_list_item_t);
         om->om_component = component;