Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/med.git] / src / MEDWrapper / V2_1 / Core / MEDchampLire.cxx

diff --git a/src/MEDWrapper/V2_1/Core/MEDchampLire.cxx b/src/MEDWrapper/V2_1/Core/MEDchampLire.cxx
index ad21a68403f3b1b7856ac2a21cfd27a89f2ead91..ddb01e8c812af2c43807ad2c50ea045f862b5949 100644 (file)
--- a/src/MEDWrapper/V2_1/Core/MEDchampLire.cxx
+++ b/src/MEDWrapper/V2_1/Core/MEDchampLire.cxx
@@ -104,8 +104,8 @@ MEDchampLire(med_idt fid,char *maa, char *cha, unsigned char *val,med_mode_switc
       else
        psize = i;
 
-      pfltabtmp = (med_int *)   malloc (sizeof(med_int)*psize);
-      pfltab = (med_ssize *) malloc (sizeof(med_ssize)*psize);
+      pfltabtmp = (med_int *)   malloc (sizeof(med_int)*(size_t)psize);
+      pfltab = (med_ssize *) malloc (sizeof(med_ssize)*(size_t)psize);
       if ((ret = MEDprofilLire(fid,pfltabtmp,profil)) < 0)
        return -1;
       for (i=0;i<psize;i++)
@@ -146,9 +146,9 @@ MEDchampLire(med_idt fid,char *maa, char *cha, unsigned char *val,med_mode_switc
                                     psize,pfltab,ngauss,val))< 0)
        return -1;
       break;
-
+      
     case MED_INT32 :
-#if defined(IRIX64)||defined(OSF1) 
+#if defined(HAVE_F77INT64) 
      if ((ret =  _MEDdatasetNumLire(datagroup2,MED_NOM_CO,MED_INT64,
                                     interlace,ncomp,numco,
                                     psize,pfltab,ngauss,val))< 0)
@@ -162,7 +162,7 @@ MEDchampLire(med_idt fid,char *maa, char *cha, unsigned char *val,med_mode_switc
      break;
 
     case MED_INT64 :
-#if defined(IRIX64)||defined(OSF1) 
+#if defined(HAVE_F77INT64) 
      if ((ret =  _MEDdatasetNumLire(datagroup2,MED_NOM_CO,MED_INT64,
                                     interlace,ncomp,numco,
                                     psize,pfltab,ngauss,val))< 0)