From 135ebe45b1aa63f3aa813aa25e7d27bd2fed6102 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Wed, 14 Jan 2004 05:48:36 +0000 Subject: [PATCH] * fix the datatyle header. I gave up figuring out ulm_scatterv_t and #if 0'ed it out. This commit was SVN r352. --- src/mpi/datatype/datatype.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mpi/datatype/datatype.h b/src/mpi/datatype/datatype.h index b9de06b7db..d0d0e71c74 100644 --- a/src/mpi/datatype/datatype.h +++ b/src/mpi/datatype/datatype.h @@ -16,6 +16,7 @@ #include #include +#include #include "lam/lfc/object.h" #include "lam/types.h" @@ -391,7 +392,7 @@ int lam_datatype_scatter_iovec(lam_pack_state_t *state, * @param csum32 pointer to a 32-bit unsigned integer to hold the checksum * @return the original value of dst */ -static inline lam_memcpy(void *dst, const void *src, size_t size, void *dummy) +static inline void *lam_memcpy(void *dst, const void *src, size_t size, void *dummy) { return memcpy(dst, src, size); } @@ -442,10 +443,10 @@ void *lam_memcpy_crc32(void *dst, const void *src, size_t size, void *crc32); void *lam_memcpy_crc64(void *dst, const void *src, size_t size, void *crc64); - -typedef (ulm_scatterv_t) (void *, int *, int *, ULMType_t *, void *, +#if 0 +typedef void (ulm_scatterv_t) (void *, int *, int *, ULMType_t *, void *, int, ULMType_t *, int, int); - +#endif #endif /* LAM_DATATYPE_H_INCLUDED */