Merge branch 'charm' of charmgit:charm into charm-mpi-interop
authorNikhil Jain <nikhil@illinois.edu>
Sat, 31 Mar 2012 17:06:35 +0000 (12:06 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Sat, 31 Mar 2012 17:06:35 +0000 (12:06 -0500)
Conflicts:
src/conv-core/converse.h

1  2 
src/arch/util/machine-common-core.c
src/ck-core/init.C
src/conv-core/converse.h

Simple merge
Simple merge
index df4b7c16c9507723bd93167d6885b8e2f1eeeab5,7d322c78cee1c695a3397cdef6bd182b181316da..34673d222043d7587bf03ab98ff8be8f32b71126
@@@ -1906,11 -1919,4 +1921,10 @@@ EXTERN void CmiNotifyCommThd(CmiNotifyC
  CpvCExtern(int, _urgentSend);
  #define CmiEnableUrgentSend(yn)   CpvAccess(_urgentSend)=(yn)
  
 +/* CharmLibInterOperate should be a global variable as it will be
 + * set only once by MPI ranks respectively.
 + */
 +extern int CharmLibInterOperate;
 +CpvExtern(int,charmLibExitFlag);
 +
  #endif /* CONVERSE_H */