Back out r14749; it wasn't quite ready for prime time yet...

This commit was SVN r14753.

The following SVN revision numbers were found above:
  r14749 --> open-mpi/ompi@48c026ce6b

ompi/mca/btl/tcp/btl_tcp_hdr.h

@@ -25,7 +25,9 @@
 #include "btl_tcp.h" 
 #include "opal/types.h"
 
-BEGIN_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+extern "C" {
+#endif
 
 /**
  * TCP header.
@@ -35,25 +37,32 @@ BEGIN_C_DECLS
 #define MCA_BTL_TCP_HDR_TYPE_PUT  2
 #define MCA_BTL_TCP_HDR_TYPE_GET  3
 
+
 struct mca_btl_tcp_hdr_t {
     mca_btl_base_header_t base;
     uint8_t  type;
     uint16_t count;
-    uint32_t size; 
+#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
+    /* uint64_t may be required to be 8 byte aligned. */
+    uint8_t padding[4];
+#endif
+    uint64_t size; 
 }; 
 typedef struct mca_btl_tcp_hdr_t mca_btl_tcp_hdr_t; 
 
 #define MCA_BTL_TCP_HDR_HTON(hdr)     \
     do {                              \
         hdr.count = htons(hdr.count); \
-        hdr.size = htonl(hdr.size);   \
+        hdr.size = hton64(hdr.size);  \
     } while (0)
 
 #define MCA_BTL_TCP_HDR_NTOH(hdr)     \
     do {                              \
         hdr.count = ntohs(hdr.count); \
-        hdr.size = ntohl(hdr.size);   \
+        hdr.size = ntoh64(hdr.size);  \
     } while (0)
 
-END_C_DECLS
+#if defined(c_plusplus) || defined(__cplusplus)
+}
+#endif
 #endif