Correctly include win32 util header.

This commit was SVN r21343.

ompi/mca/btl/tcp/btl_tcp_component.c

@@ -53,9 +53,6 @@
 #include "opal/util/output.h"
 #include "opal/util/argv.h"
 #include "opal/util/net.h"
-#if defined(__WINDOWS__)
-#include "opal/win32/ompi_inet.h"
-#endif
 
 #include "orte/types.h"
 #include "orte/util/show_help.h"

opal/win32/ompi_inet.c

@@ -19,8 +19,8 @@
 
 #include "opal_config.h"
 
+#include "opal/win32/ompi_inet.h"
 #include "opal/util/output.h"
-#include "ompi_inet.h"
 
 /* 
  * convert from presentation format (which usually means ASCII printable)
@@ -31,8 +31,7 @@
  *    0 if the address wasn't valid (`dst' is untouched in this case)
  *    -1 if some other error occurred (`dst' is untouched in this case, too)
  */
-static int
-inet_pton(int af, const char *src, void *dst)
+int inet_pton(int af, const char *src, void *dst)
 {
     int addr_len;
     struct sockaddr sa;
@@ -78,8 +77,7 @@ inet_pton(int af, const char *src, void *dst)
  * return:
  *    pointer to presentation format address (`dst'), or NULL.
  */
-static const char *
-inet_ntop(int af, const void *src, char *dst, size_t size)
+const char *inet_ntop(int af, const void *src, char *dst, size_t size)
 {
     int addr_len;
     struct sockaddr sa;

opal/win32/ompi_inet.h

@@ -19,12 +19,18 @@
 #ifndef OMPI_INET_H
 #define OMPI_INET_H
 
+#include "opal_config.h"
+
+#ifndef OMPI_WIN_COMPAT_H
+#error This file is supposed to be included only from win_compat.h
+#endif  /* OMPI_WIN_COMPAT_H */
 
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
 
 OPAL_DECLSPEC int inet_pton(int af, const char *src, void *dst);
+
 OPAL_DECLSPEC const char *inet_ntop(int af, const void *src, char *dst, size_t size);
 
 #if defined(c_plusplus) || defined(__cplusplus)

opal/win32/win_compat.h

@@ -5,7 +5,7 @@
  * Copyright (c) 2004-2006 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ * Copyright (c) 2004-2009 High Performance Computing Center Stuttgart, 
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
@@ -85,6 +85,7 @@
 #include "opal/win32/ompi_utsname.h"
 #include "opal/win32/ompi_util.h"
 #include "opal/win32/ompi_misc.h"
+#include "opal/win32/ompi_inet.h"
 #endif
 
 #define MAXPATHLEN _MAX_PATH