diff -rupN ml-6.2/configure ml-6.2_built/configure --- ml-6.2/configure 2008-09-18 13:30:35.000000000 -0400 +++ ml-6.2_built/configure 2011-05-31 15:15:59.381131000 -0400 @@ -1122,7 +1122,7 @@ do -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) target_alias=$ac_optarg ;; - -v | -verbose | --verbose | --verbos | --verbo | --verb) + -v | -verbose | --verbos | --verbo | --verb) verbose=yes ;; -version | --version | --versio | --versi | --vers | -V) @@ -9635,7 +9635,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec } && test -s conftest.$ac_objext; then ac_cv_prog_f77_v= # Try some options frequently used verbose output -for ac_verb in -v -verbose --verbose -V -\#\#\#; do +for ac_verb in -v -verbose -V -\#\#\#; do cat >conftest.$ac_ext <<_ACEOF program main @@ -17948,7 +17948,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec } && test -s conftest.$ac_objext; then ac_cv_prog_f77_v= # Try some options frequently used verbose output -for ac_verb in -v -verbose --verbose -V -\#\#\#; do +for ac_verb in -v -verbose -V -\#\#\#; do cat >conftest.$ac_ext <<_ACEOF program main diff -rupN ml-6.2/src/Coarsen/ml_agg_min_energy.cpp ml-6.2_built/src/Coarsen/ml_agg_min_energy.cpp --- ml-6.2/src/Coarsen/ml_agg_min_energy.cpp 2008-08-01 14:14:18.000000000 -0400 +++ ml-6.2_built/src/Coarsen/ml_agg_min_energy.cpp 2011-06-02 09:49:57.913504372 -0400 @@ -23,6 +23,10 @@ static int Dinv_size = -1; static double* Dinv = 0; static bool SinglePrecision = true; // to save memory +#ifdef ICL +void *ml_void_mem_ptr; +#endif + // ====================================================================== // Take each column of Op, compute its 2-norm squared, and store // in Column2Norm[]. diff -rupN ml-6.2/src/MLAPI/MLAPI_Workspace.cpp ml-6.2_built/src/MLAPI/MLAPI_Workspace.cpp --- ml-6.2/src/MLAPI/MLAPI_Workspace.cpp 2008-08-01 14:14:19.000000000 -0400 +++ ml-6.2_built/src/MLAPI/MLAPI_Workspace.cpp 2011-06-02 09:51:15.926500842 -0400 @@ -116,7 +116,11 @@ void Init() #endif printf("%s\n",buf); fflush(stdout); +#ifdef ICL + Sleep(1); +#else sleep(1); +#endif } } if (GetMyPID() == 0) { diff -rupN ml-6.2/src/Utils/ml_epetra_utils.cpp ml-6.2_built/src/Utils/ml_epetra_utils.cpp --- ml-6.2/src/Utils/ml_epetra_utils.cpp 2008-09-05 14:42:49.000000000 -0400 +++ ml-6.2_built/src/Utils/ml_epetra_utils.cpp 2011-06-02 09:52:12.626962585 -0400 @@ -3479,7 +3479,11 @@ void ML_BreakForDebugger(const Epetra_Co #endif printf("%s\n",buf); fflush(stdout); +#ifdef ICL + Sleep(1); +#else sleep(1); +#endif } } if(Comm.MyPID() == 0) { diff -rupN ml-6.2/src/Utils/ml_utils.c ml-6.2_built/src/Utils/ml_utils.c --- ml-6.2/src/Utils/ml_utils.c 2008-07-16 11:26:11.000000000 -0400 +++ ml-6.2_built/src/Utils/ml_utils.c 2011-06-02 09:53:43.394223600 -0400 @@ -1894,7 +1894,9 @@ void ML_serial_end(ML_Comm *comm) /* the developer to attach a debugger if desired. */ /* (Based on code from ALEGRA). */ /* ******************************************************************** */ +#ifndef ICL #include +#endif void ML_BreakForDebugger(ML_Comm *comm) { int i,j; @@ -1930,7 +1932,11 @@ void ML_BreakForDebugger(ML_Comm *comm) #endif printf("%s\n",buf); fflush(stdout); +#ifdef ICL + Sleep(1); +#else sleep(1); +#endif } } if(mypid == 0) { diff -rupN ml-6.2/test/RefMaxwell/cxx_main.cpp ml-6.2_built/test/RefMaxwell/cxx_main.cpp --- ml-6.2/test/RefMaxwell/cxx_main.cpp 2008-05-28 18:17:09.000000000 -0400 +++ ml-6.2_built/test/RefMaxwell/cxx_main.cpp 2011-06-02 09:54:09.051854158 -0400 @@ -16,7 +16,9 @@ #include #include +#ifndef ICL #include +#endif #include "ml_include.h" #if defined(HAVE_ML_EPETRA) && defined(HAVE_ML_AZTECOO) && defined(HAVE_ML_IFPACK) && defined(HAVE_ML_EPETRAEXT)