Some small changes to get libmpi building on Windows. Also fixed a typo in convertor.h

This commit was SVN r6051.

src/datatype/.compile_files

@@ -15,3 +15,4 @@ dt_unpack.c
 fake_stack.c
 dt_external32.c
 dt_match_size.c
+convertor.c

src/datatype/convertor.h

@@ -41,7 +41,7 @@ struct ompi_datatype_t;
 #define CONVERTOR_CLONE            0x00100000
 #define CONVERTOR_STATE_MASK       0xFF000000
 #define CONVERTOR_STATE_START      0x01000000
-#define CONVEROTR_STATE_COMPLETE   0x02000000
+#define CONVERTOR_STATE_COMPLETE   0x02000000
 #define CONVERTOR_STATE_ALLOC      0x04000000
 
 typedef int32_t (*conversion_fct_t)( uint32_t count,
@@ -162,7 +162,7 @@ ompi_convertor_get_unpacked_size( const ompi_convertor_t* pConv,
  * outside. The data preparation should use the specialized prepare_for_send and
  * prepare_for_recv functions.
  */
-int ompi_convertor_prepare( ompi_convertor_t* convertor,
+OMPI_DECLSPEC int ompi_convertor_prepare( ompi_convertor_t* convertor,
                             const struct ompi_datatype_t* datatype, int32_t count,
                             const void* pUserBuf );
 

src/mca/iof/base/iof_base_setup.c

@@ -43,6 +43,9 @@
 #endif
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
+# ifdef HAVE_TERMIO_H
+#  include <termio.h>
+# endif
 #endif
 
 #include "mca/iof/base/iof_base_setup.h"
@@ -116,6 +119,7 @@ orte_iof_base_setup_child(orte_iof_base_io_conf_t *opts)
 
     if (opts->usepty) {
         if (opts->connect_stdin) {
+#ifndef WIN32
             /* disable echo */
             struct termios term_attrs;
             if (tcgetattr(opts->p_stdout[1], &term_attrs) < 0) {
@@ -130,6 +134,7 @@ orte_iof_base_setup_child(orte_iof_base_io_conf_t *opts)
             /* and connect the pty to stdin */
             ret = dup2(opts->p_stdout[1], fileno(stdin)); 
             if (ret < 0) return OMPI_ERROR;
+#endif
         } else {
             int fd;
             /* connect input to /dev/null */

src/util/pty.c

@@ -55,7 +55,9 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>
 #else

src/win32/generated_include/ompi_config.h

@@ -240,6 +240,9 @@
 /* Define if realtime signals work on pipes */
 /* #undef HAVE_WORKING_RTSIG */
 
+/* Define if fcntl.h works */
+#define HAVE_FCNTL_H
+
 /* C type corresponding to Fortran INTEGER */
 #define MPI_Fint int
 

src/win32/win_compat.h

@@ -95,4 +95,10 @@ typedef unsigned int uint;
 
 #define sigset_t int
 
+/*
+ * Mask these to Windows equlivants
+ */
+#define bzero(p, l) memset(p, 0, l)
+#define bcopy(s, t, l) memmove(t, s, l)
+
 #endif /* compat */

src/win_makefile

@@ -116,8 +116,6 @@ INCL = \
 
 CFLAGS = \
         /DWIN32 \
-        /DOMPI_BUILDING=1 \
-        /DOMPI_BUILDING_LIBRARY=1 \
         /DOMPI_SYSCONFDIR="\"${sysconfdir}\"" \
         /DOMPI_PKGLIBDIR="\"${pkglibdir}\"" \
         /DOMPI_PKGDATADIR="\"${pkgdatadir}\"" \