- define ompi_socklen_t to socket_t (not int) for AIX

- <netinet/tcp.h> (if necessary) should be included after <netinet/in.h> 
i.e. order is important for AIX.

This commit was SVN r5265.

src/include/types.h

@@ -101,7 +101,7 @@ typedef void* ompi_iov_base_ptr_t;
  * handle differences in socklen_t
  */
 
-#if defined(__linux__)
+#if defined(__linux__) || defined(_AIX)
 typedef socklen_t ompi_socklen_t;
 #else
 typedef int ompi_socklen_t;

src/mca/oob/tcp/oob_tcp_peer.c

@@ -25,15 +25,15 @@
 #include <sys/types.h>
 #endif
 #include "include/ompi_socket_errno.h"
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
 
 #include "class/ompi_proc_table.h"
 #include "util/output.h"

src/mca/ptl/tcp/src/ptl_tcp_peer.c

@@ -26,12 +26,12 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif