From ee3b22e4b7da5ffdfe915b58d3516fd4350c741d Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 23 Jul 2010 01:30:01 +0000 Subject: [PATCH] Oops -- use the right function name, otherwise you get compile/link errors when you configure with --enable-heterogeneous. This is why we have MTT. :-) This commit was SVN r23481. --- ompi/mca/osc/pt2pt/osc_pt2pt_header.h | 4 ++-- ompi/mca/osc/rdma/osc_rdma_header.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_header.h b/ompi/mca/osc/pt2pt/osc_pt2pt_header.h index d08866ffd0..e080333595 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_header.h +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_header.h @@ -70,7 +70,7 @@ typedef struct ompi_osc_pt2pt_send_header_t ompi_osc_pt2pt_send_header_t; OMPI_OSC_PT2PT_BASE_HDR_HTON((hdr).hdr_base) \ (hdr).hdr_origin = htonl((hdr).hdr_origin); \ (hdr).hdr_origin_tag = htonl((hdr).hdr_origin_tag); \ - (hdr).hdr_target_disp = htonll((hdr).hdr_target_disp); \ + (hdr).hdr_target_disp = hton64((hdr).hdr_target_disp); \ (hdr).hdr_target_count = htonl((hdr).hdr_target_count); \ (hdr).hdr_target_op = htonl((hdr).hdr_target_op); \ (hdr).hdr_msg_length = htonl((hdr).hdr_msg_length); \ @@ -81,7 +81,7 @@ typedef struct ompi_osc_pt2pt_send_header_t ompi_osc_pt2pt_send_header_t; OMPI_OSC_PT2PT_BASE_HDR_NTOH((hdr).hdr_base) \ (hdr).hdr_origin = ntohl((hdr).hdr_origin); \ (hdr).hdr_origin_tag = ntohl((hdr).hdr_origin_tag); \ - (hdr).hdr_target_disp = ntohllo((hdr).hdr_target_disp); \ + (hdr).hdr_target_disp = ntoh64((hdr).hdr_target_disp); \ (hdr).hdr_target_count = ntohl((hdr).hdr_target_count); \ (hdr).hdr_target_op = ntohl((hdr).hdr_target_op); \ (hdr).hdr_msg_length = ntohl((hdr).hdr_msg_length); \ diff --git a/ompi/mca/osc/rdma/osc_rdma_header.h b/ompi/mca/osc/rdma/osc_rdma_header.h index 3e648f12ef..873dd3e3b9 100644 --- a/ompi/mca/osc/rdma/osc_rdma_header.h +++ b/ompi/mca/osc/rdma/osc_rdma_header.h @@ -75,7 +75,7 @@ typedef struct ompi_osc_rdma_send_header_t ompi_osc_rdma_send_header_t; (hdr).hdr_windx = htons((hdr).hdr_windx); \ (hdr).hdr_origin = htonl((hdr).hdr_origin); \ (hdr).hdr_origin_tag = htonl((hdr).hdr_origin_tag); \ - (hdr).hdr_target_disp = htonll((hdr).hdr_target_disp); \ + (hdr).hdr_target_disp = hton64((hdr).hdr_target_disp); \ (hdr).hdr_target_count = htonl((hdr).hdr_target_count); \ (hdr).hdr_target_op = htonl((hdr).hdr_target_op); \ (hdr).hdr_msg_length = htonl((hdr).hdr_msg_length); \ @@ -87,7 +87,7 @@ typedef struct ompi_osc_rdma_send_header_t ompi_osc_rdma_send_header_t; (hdr).hdr_windx = ntohs((hdr).hdr_windx); \ (hdr).hdr_origin = ntohl((hdr).hdr_origin); \ (hdr).hdr_origin_tag = ntohl((hdr).hdr_origin_tag); \ - (hdr).hdr_target_disp = ntohll((hdr).hdr_target_disp); \ + (hdr).hdr_target_disp = ntoh64((hdr).hdr_target_disp); \ (hdr).hdr_target_count = ntohl((hdr).hdr_target_count); \ (hdr).hdr_target_op = ntohl((hdr).hdr_target_op); \ (hdr).hdr_msg_length = ntohl((hdr).hdr_msg_length); \