This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via a0c4278f1400a73eb63c5106e2bd3b1a6565ad5a (commit) from b0c0f93fb68821d3dd4b24582094739740836dd5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/a0c4278f1400a73eb63c5106e2bd3b1a65... commit a0c4278f1400a73eb63c5106e2bd3b1a6565ad5a Author: Rob Latham <[email protected]> Date: Thu Dec 5 15:33:47 2013 -0600 fix compile errors with lustre - the XOPEN_SOURCE definition seems to be uneeded. It was there from the early days, probably defensively, but it messes up the declaration of caddr_t needed by quota.h which in turn is recently needed by lustre. - the reworked hint functions for lustre did not compile. oops. Closes #1973 diff --git a/src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c b/src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c index 8872e01..aaab557 100644 --- a/src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c +++ b/src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c @@ -140,17 +140,17 @@ void ADIOI_LUSTRE_SetInfo(ADIO_File fd, MPI_Info users_info, int *error_code) /* CO: IO Clients/OST, * to keep the load balancing between clients and OSTs */ ADIOI_Info_check_and_install_int(fd, users_info, "romio_lustre_co_ratio", - &(fd->hints->fs_hints.lustre.co_ratio)); + &(fd->hints->fs_hints.lustre.co_ratio), myname, error_code ); /* coll_threshold: * if the req size is bigger than this, collective IO may not be performed. */ ADIOI_Info_check_and_install_int(fd, users_info, "romio_lustre_coll_threshold", - &(fd->hints->fs_hints.lustre.coll_threshold) ); + &(fd->hints->fs_hints.lustre.coll_threshold), myname, error_code ); /* ds_in_coll: disable data sieving in collective IO */ ADIOI_Info_check_and_install_enabled(fd, users_info, "romio_lustre_ds_in_coll", - &(fd->hints->fs_hints.lustre.ds_in_coll) ); + &(fd->hints->fs_hints.lustre.ds_in_coll), myname, error_code ); } /* set the values for collective I/O and data sieving parameters */ diff --git a/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c b/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c index 0b7bc24..4168acf 100644 --- a/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c +++ b/src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c @@ -8,7 +8,6 @@ * Copyright (C) 2008 Sun Microsystems, Lustre group */ -#define _XOPEN_SOURCE 600 #include <stdlib.h> #include <malloc.h> #include "ad_lustre.h" ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_lustre/ad_lustre_hints.c | 6 +++--- src/mpi/romio/adio/ad_lustre/ad_lustre_rwcontig.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository