--- imach/src/imach.c 2003/06/25 15:30:29 1.91 +++ imach/src/imach.c 2003/06/25 16:30:45 1.92 @@ -1,6 +1,10 @@ -/* $Id: imach.c,v 1.91 2003/06/25 15:30:29 brouard Exp $ +/* $Id: imach.c,v 1.92 2003/06/25 16:30:45 brouard Exp $ $State: Exp $ $Log: imach.c,v $ + Revision 1.92 2003/06/25 16:30:45 brouard + (Module): On windows (cygwin) function asctime_r doesn't + exist so I changed back to asctime which exists. + Revision 1.91 2003/06/25 15:30:29 brouard * imach.c (Repository): Duplicated warning errors corrected. (Repository): Elapsed time after each iteration is now output. It @@ -181,11 +185,11 @@ #define ODIRSEPARATOR '/' #endif -/* $Id: imach.c,v 1.91 2003/06/25 15:30:29 brouard Exp $ */ +/* $Id: imach.c,v 1.92 2003/06/25 16:30:45 brouard Exp $ */ /* $State: Exp $ */ char version[]="Imach version 0.96a, June 2003, INED-EUROREVES "; -char fullversion[]="$Revision: 1.91 $ $Date: 2003/06/25 15:30:29 $"; +char fullversion[]="$Revision: 1.92 $ $Date: 2003/06/25 16:30:45 $"; int erreur, nberr=0, nbwarn=0; /* Error number, number of errors number of warnings */ int nvar; int cptcovn=0, cptcovage=0, cptcoveff=0,cptcov; @@ -778,7 +782,8 @@ void powell(double p[], double **xi, int fprintf(ficrespow,"\n");fflush(ficrespow); if(*iter <=3){ tm = *localtime(&curr_time.tv_sec); - asctime_r(&tm,strcurr); + strcpy(strcurr,asctime(&tmf)); +/* asctime_r(&tm,strcurr); */ forecast_time=curr_time; itmp = strlen(strcurr); if(strcurr[itmp-1]=='\n') @@ -788,8 +793,8 @@ void powell(double p[], double **xi, int for(niterf=10;niterf<=30;niterf+=10){ forecast_time.tv_sec=curr_time.tv_sec+(niterf-*iter)*(curr_time.tv_sec-last_time.tv_sec); tmf = *localtime(&forecast_time.tv_sec); - asctime_r(&tmf,strfor); -/* strcpy(strfor,asctime(&tmf)); */ +/* asctime_r(&tmf,strfor); */ + strcpy(strfor,asctime(&tmf)); itmp = strlen(strfor); if(strfor[itmp-1]=='\n') strfor[itmp-1]='\0';