This patch is not correct. All these variables have been moved into the ORTE layer (they are declared in orte/mca/debugger/base/base.h), so they should be in fact removed from the MPI level files.
While I don't think moving them all in the ORTE was a good choice, changing their definition in these files will not help. Now these symbols are defined twice, once as ORTE_DECLSPEC and once as OMPI_DECLSPEC. george. On Dec 15, 2011, at 13:40 , jsquy...@osl.iu.edu wrote: > Author: jsquyres > Date: 2011-12-15 13:40:25 EST (Thu, 15 Dec 2011) > New Revision: 25661 > URL: https://svn.open-mpi.org/trac/ompi/changeset/25661 > > Log: > Fix typos: these should be OMPI_DECLSPEC, not ORTE_DECLSPEC. > > Text files modified: > trunk/ompi/debuggers/debuggers.h | 4 ++-- > > trunk/ompi/debuggers/ompi_debuggers.c | 6 +++--- > > 2 files changed, 5 insertions(+), 5 deletions(-) > > Modified: trunk/ompi/debuggers/debuggers.h > ============================================================================== > --- trunk/ompi/debuggers/debuggers.h (original) > +++ trunk/ompi/debuggers/debuggers.h 2011-12-15 13:40:25 EST (Thu, 15 Dec > 2011) > @@ -9,7 +9,7 @@ > * University of Stuttgart. All rights reserved. > * Copyright (c) 2004-2005 The Regents of the University of California. > * All rights reserved. > - * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. > + * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. > * $COPYRIGHT$ > * > * Additional copyrights may follow > @@ -44,7 +44,7 @@ > /** > * Breakpoint function for parallel debuggers. > */ > -ORTE_DECLSPEC extern void MPIR_Breakpoint(void); > +OMPI_DECLSPEC extern void MPIR_Breakpoint(void); > > END_C_DECLS > > > Modified: trunk/ompi/debuggers/ompi_debuggers.c > ============================================================================== > --- trunk/ompi/debuggers/ompi_debuggers.c (original) > +++ trunk/ompi/debuggers/ompi_debuggers.c 2011-12-15 13:40:25 EST (Thu, > 15 Dec 2011) > @@ -10,7 +10,7 @@ > * University of Stuttgart. All rights reserved. > * Copyright (c) 2004-2005 The Regents of the University of California. > * All rights reserved. > - * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. > + * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. > * $COPYRIGHT$ > * > * Additional copyrights may follow > @@ -126,8 +126,8 @@ > OMPI_DECLSPEC ompi_datatype_t* ompi_datatype_t_type_force_inclusion = NULL; > > OMPI_DECLSPEC volatile int MPIR_debug_gate = 0; > -ORTE_DECLSPEC extern volatile int MPIR_being_debugged; > -ORTE_DECLSPEC extern volatile int MPIR_debug_state; > +OMPI_DECLSPEC extern volatile int MPIR_being_debugged; > +OMPI_DECLSPEC extern volatile int MPIR_debug_state; > OMPI_DECLSPEC char *MPIR_debug_abort_string = ""; > > /* Check for a file in few direct ways for portability */ > _______________________________________________ > svn-full mailing list > svn-f...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/svn-full
