From 9fee7c2b4dce5ed10de5cee81714efb883fbc8fb Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 23 Jan 2014 14:15:35 +0000 Subject: [PATCH] According to a report from Adam Moody, there is a compile error with ROMIO and Lustre 2.4.0. It has been solved upstream already; here's the ticket: http://trac.mpich.org/projects/mpich/ticket/1973 And here's the commit that fixed it: http://trac.mpich.org/projects/mpich/changeset/a0c4278f1400a73eb63c5106e2bd3b1a6565ad5a OMPI does not have the other code referred to in that git commit (in ad_lustre_hints.c). Thanks to Adam Moody for reporting the issue. cmr=v1.7.4:reviewer=hjelmn:subject=Fix ROMIO compile error w/ Lustre 2.4 This commit was SVN r30393. --- ompi/mca/io/romio/romio/README_OMPI | 2 ++ ompi/mca/io/romio/romio/adio/ad_lustre/ad_lustre_rwcontig.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ompi/mca/io/romio/romio/README_OMPI b/ompi/mca/io/romio/romio/README_OMPI index 4ae14fd82e..d118a927cb 100644 --- a/ompi/mca/io/romio/romio/README_OMPI +++ b/ompi/mca/io/romio/romio/README_OMPI @@ -24,3 +24,5 @@ Local modifications: Patches past 3.0.4: (Update whenever ROMIO is updated) - Deal with endless ESTALE cases: http://git.mpich.org/mpich.git/commit/b250d338e66667a8a1071a5f73a4151fd59f83b2 +- Fix compile error with Lustre 2.4 + http://trac.mpich.org/projects/mpich/changeset/a0c4278f1400a73eb63c5106e2bd3b1a6565ad5a \ No newline at end of file diff --git a/ompi/mca/io/romio/romio/adio/ad_lustre/ad_lustre_rwcontig.c b/ompi/mca/io/romio/romio/adio/ad_lustre/ad_lustre_rwcontig.c index 0b7bc248c6..4168acf9a8 100644 --- a/ompi/mca/io/romio/romio/adio/ad_lustre/ad_lustre_rwcontig.c +++ b/ompi/mca/io/romio/romio/adio/ad_lustre/ad_lustre_rwcontig.c @@ -8,7 +8,6 @@ * Copyright (C) 2008 Sun Microsystems, Lustre group */ -#define _XOPEN_SOURCE 600 #include #include #include "ad_lustre.h"