From: Julian Seward <jseward@acm.org>
Date: Fri, 10 Mar 2006 22:17:57 +0000 (+0000)
Subject: Quadrics MPI build fixes.
X-Git-Tag: svn/VALGRIND_3_2_0~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d53b9625efd5d67ecf5467b28654a89d66ee96ca;p=thirdparty%2Fvalgrind.git

Quadrics MPI build fixes.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5743
---

diff --git a/auxprogs/mpiwrap.c b/auxprogs/mpiwrap.c
index 5e1e632585..30bfc49e82 100644
--- a/auxprogs/mpiwrap.c
+++ b/auxprogs/mpiwrap.c
@@ -394,8 +394,12 @@ static long sizeofOneNamedTy ( MPI_Datatype ty )
    if (ty == MPI_BYTE)           return 1;
    /* MPI_PACKED */
    /* new in MPI2: */
+#  if defined(MPI_WCHAR)
    if (ty == MPI_WCHAR)              return sizeof(wchar_t);
+#  endif
+#  if defined(MPI_SIGNED_CHAR)
    if (ty == MPI_SIGNED_CHAR)        return sizeof(signed char);
+#  endif
    if (ty == MPI_UNSIGNED_LONG_LONG) return sizeof(unsigned long long int);
    if (ty == MPI_LONG_LONG_INT)      return sizeof(signed long long int);
    /* Note: the following are named structs, not named basic types,
@@ -467,6 +471,8 @@ void walk_type ( void(*f)(void*,long), char* base, MPI_Datatype ty )
          f(base + offsetof(Ty,loc), sizeof(int));
          return;
       }
+      if (ty == MPI_LB || ty == MPI_UB)
+         return; /* have zero size, so nothing needs to be done */
       goto unhandled;
       /*NOTREACHED*/
    }