Minor changes to run version 0.8a on Linux. Bad ifdef linux.

diff --git a/src/imach.c b/src/imach.c
index 0b94cf682b0dcf16b8a93bf4c7eec8a44ed75231..636f597133a74539bb4ad4d78b48b0da79c43281 100644 (file)
--- a/src/imach.c
+++ b/src/imach.c
@@ -60,7 +60,8 @@
 /*#define GNUPLOTPROGRAM "..\\gp37mgw\\wgnuplot"*/\r
 #define FILENAMELENGTH 80\r
 /*#define DEBUG*/\r
-#define windows\r
+\r
+/*#define windows*/\r
 #define        GLOCK_ERROR_NOPATH              -1      /* empty path */\r
 #define        GLOCK_ERROR_GETCWD              -2      /* cannot get cwd */\r
 \r
@@ -2158,12 +2159,7 @@ m=pow(2,cptcoveff);
   for (cpt=1; cpt<= nlstate ; cpt ++) {\r
    for (k1=1; k1<= m ; k1 ++) {\r
 \r
-#ifdef windows\r
-    fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter gif small size 400,300\nplot [%.f:%.f] \"vpl%s\" every :::%d::%d u 1:2 \"\%%lf",ageminpar,fage,fileres,k1-1,k1-1);\r
-#endif\r
-#ifdef unix\r
-fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nplot [%.f:%.f] \"vpl%s\" u 1:2 \"\%%lf",ageminpar,fage,fileres);\r
-#endif\r
+     fprintf(ficgp,"set xlabel \"Age\" \nset ylabel \"Probability\" \nset ter gif small size 400,300\nplot [%.f:%.f] \"vpl%s\" every :::%d::%d u 1:2 \"\%%lf",ageminpar,fage,fileres,k1-1,k1-1);\r
 \r
 for (i=1; i<= nlstate ; i ++) {\r
   if (i==cpt) fprintf(ficgp," \%%lf (\%%lf)");\r
@@ -2180,9 +2176,7 @@ for (i=1; i<= nlstate ; i ++) {
   else fprintf(ficgp," \%%*lf (\%%*lf)");\r
 }  \r
      fprintf(ficgp,"\" t\"\" w l 1,\"p%s\" every :::%d::%d u 1:($%d) t\"Observed prevalence \" w l 2",fileres,k1-1,k1-1,2+4*(cpt-1));\r
-#ifdef unix\r
-fprintf(ficgp,"\nset ter gif small size 400,300");\r
-#endif\r
+\r
 fprintf(ficgp,"\nset out \"v%s%d%d.gif\" \nreplot\n\n",strtok(optionfile, "."),cpt,k1);\r
    }\r
   }\r
@@ -3526,9 +3520,7 @@ free_matrix(mint,1,maxwav,1,n);
 \r
 \r
  end:\r
-#ifdef windows\r
   /* chdir(pathcd);*/\r
-#endif \r
  /*system("wgnuplot graph.plt");*/\r
  /*system("../gp37mgw/wgnuplot graph.plt");*/\r
  /*system("cd ../gp37mgw");*/\r
@@ -3538,7 +3530,7 @@ free_matrix(mint,1,maxwav,1,n);
  strcat(plotcmd,optionfilegnuplot);\r
  system(plotcmd);\r
 \r
-#ifdef windows\r
+ /*#ifdef windows*/\r
   while (z[0] != 'q') {\r
     /* chdir(path); */\r
     printf("\nType e to edit output files, g to graph again, c to start again, and q for exiting: ");\r
@@ -3548,7 +3540,7 @@ free_matrix(mint,1,maxwav,1,n);
     else if (z[0] == 'g') system(plotcmd);\r
     else if (z[0] == 'q') exit(0);\r
   }\r
-#endif \r
+  /*#endif */\r
 }\r
 \r
 \r