From fbf1ec6f2e502c7c6c55fcef71decf882b3a779c Mon Sep 17 00:00:00 2001
From: Josh Hursey <jjhursey@open-mpi.org>
Date: Tue, 19 Apr 2005 04:24:13 +0000
Subject: [PATCH] Inching towards a compiling Windows build. Some cleanup
 changes...

This commit was SVN r5432.
---
 src/mca/ptl/tcp/src/ptl_tcp_proc.c | 3 +++
 src/util/malloc.h                  | 4 ++--
 src/util/proc_info.c               | 2 +-
 src/win32/win_compat.h             | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/mca/ptl/tcp/src/ptl_tcp_proc.c b/src/mca/ptl/tcp/src/ptl_tcp_proc.c
index c49a41295b..13a41104ee 100644
--- a/src/mca/ptl/tcp/src/ptl_tcp_proc.c
+++ b/src/mca/ptl/tcp/src/ptl_tcp_proc.c
@@ -152,7 +152,10 @@ mca_ptl_tcp_proc_t* mca_ptl_tcp_proc_lookup(const orte_process_name_t *name)
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+
 /*
  * Note that this routine must be called with the lock on the process already 
  * held.  Insert a ptl instance into the proc array and assign it an address.
diff --git a/src/util/malloc.h b/src/util/malloc.h
index 4e08f40369..51af3923ed 100644
--- a/src/util/malloc.h
+++ b/src/util/malloc.h
@@ -80,7 +80,7 @@ void ompi_malloc_finalize(void);
    * This function is only used when --enable-mem-debug was specified to
    * configure (or by default if you're building in a SVN checkout).
    */
-void *ompi_malloc(size_t size, const char *file, int line);
+OMPI_DECLSPEC void *ompi_malloc(size_t size, const char *file, int line);
 
   /**
    * \internal
@@ -128,7 +128,7 @@ void *ompi_realloc(void *ptr, size_t size, const char *file, int line);
    * to configure (or by default if you're building in a SVN
    * checkout).
    */
-void ompi_free(void *addr, const char *file, int line);
+OMPI_DECLSPEC void ompi_free(void *addr, const char *file, int line);
 
 OMPI_DECLSPEC extern int ompi_malloc_debug_level;
 OMPI_DECLSPEC extern int ompi_malloc_output;
diff --git a/src/util/proc_info.c b/src/util/proc_info.c
index 962a8f2ca1..e0fe0a5c8a 100644
--- a/src/util/proc_info.c
+++ b/src/util/proc_info.c
@@ -31,7 +31,7 @@
 
 #include "util/proc_info.h"
 
-orte_proc_info_t orte_process_info = {
+OMPI_DECLSPEC orte_proc_info_t orte_process_info = {
     /*  .my_name =              */   NULL,
     /*  .vpid_start =           */   0,
     /*  .num_procs =            */   1,
diff --git a/src/win32/win_compat.h b/src/win32/win_compat.h
index 3900bbe2ae..8ce848bd51 100644
--- a/src/win32/win_compat.h
+++ b/src/win32/win_compat.h
@@ -49,12 +49,14 @@
 #include <process.h>
 #include <io.h>
 #include <signal.h>
+/*#if defined(OMPI_BUILDING) && OMPI_BUILDING */
 #include "win32/ompi_uio.h"
 #include "win32/ompi_time.h"
 #include "win32/ompi_utsname.h"
 #include "win32/ompi_util.h"
 #include "win32/ompi_misc.h"
 #include "util/printf.h"
+/*#endif*/
 
 #define MAXPATHLEN MAX_PATH
 #define MAXHOSTNAMELEN MAX_PATH