Skip to content

Commit 1db8082

Browse files
Joe-DownsJoseph Downs
authored andcommitted
WIP: temp fix for Aint problems
1 parent 870e925 commit 1db8082

File tree

1 file changed

+35
-6
lines changed

1 file changed

+35
-6
lines changed

ompi/mpi/c/abi.h.in

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
* $HEADER$
77
*/
88

9+
#include "stddef.h"
10+
#include "stdint.h"
11+
12+
//#include <stdint.h>
13+
914
#define MPI_VERSION 5
1015
#define MPI_SUBVERSION 0
1116

@@ -24,19 +29,43 @@ typedef struct MPI_ABI_Request * MPI_Request;
2429
typedef struct MPI_ABI_Session * MPI_Session;
2530
typedef struct MPI_ABI_Win * MPI_Win;
2631

32+
/* /\* MPI_Aint is defined to be intptr_t (or equivalent to it, if compiler support is absent). */
33+
/* * The only acceptable alternative to intptr_t is the C89 type equivalent to it. *\/ */
34+
/* #if !defined(MPI_ABI_Aint) */
35+
/* #define MPI_ABI_Aint intptr_t */
36+
/* #endif */
37+
/* typedef MPI_ABI_Aint MPI_Aint; */
38+
/* #undef MPI_ABI_Aint */
39+
40+
/* /\* MPI_Offset will be 64b on all relevant systems. */
41+
/* * We allow for MPI implementations supporting for 128b filesystems. *\/ */
42+
/* #if !defined(MPI_ABI_Offset) */
43+
/* #define MPI_ABI_Offset int64_t */
44+
/* #endif */
45+
/* typedef MPI_ABI_Offset MPI_Offset; */
46+
/* #undef MPI_ABI_Offset */
47+
48+
/* /\* MPI_Count must be large enough to hold the larger of MPI_Aint and MPI_Offset. */
49+
/* * Platforms where MPI_Aint is larger than MPI_Offset are extremely rare. *\/ */
50+
/* #if !defined(MPI_ABI_Count) */
51+
/* #define MPI_ABI_Count MPI_Offset */
52+
/* #endif */
53+
/* typedef MPI_ABI_Count MPI_Count; */
54+
/* #undef MPI_ABI_Count */
55+
2756
typedef struct {
2857
int MPI_SOURCE;
2958
int MPI_TAG;
3059
int MPI_ERROR;
3160
int MPI_internal[5];
3261
} MPI_Status;
3362

34-
/*
35-
* The following categories and values are taken, in order, from Section A.1
36-
* ("Defined Values and Handles") of the MPI Standard, v5.0. Each category
37-
* (header comment followed by block of assignments) corresponds to a table
38-
* within Section A.1.
39-
*/
63+
/*****************************************************************************/
64+
/* The following categories and values are taken, in order, from Section A.1 */
65+
/* ("Defined Values and Handles") of the MPI Standard, v5.0. Each category */
66+
/* (header comment followed by block of assignments) corresponds to a table */
67+
/* within Section A.1. */
68+
/*****************************************************************************/
4069

4170
/* Error classes */
4271
$CATEGORY:ERROR_CLASSES$

0 commit comments

Comments
 (0)