source: ThirdParty/Glpk/trunk/glpk.patch @ 1228

Last change on this file since 1228 was 1228, checked in by stefan, 11 years ago

add patch for compilation on sun os ('sun' seem to be an unlucky name for a variable there)

File size: 1.4 KB
  • glpk/src/glplpx01.c

    diff -Naur glpk/src/glplpx01.c.orig glpk/src/glplpx01.c
    old new  
    382382      ret = glp_simplex(lp, &parm);
    383383      switch (ret)
    384384      {  case 0:           ret = LPX_E_OK;      break;
    385          case GLP_EBADB:
     385         case GLP_EBADB:   ret = LPX_E_BADB;    break;
    386386         case GLP_ESING:
    387387         case GLP_ECOND:
    388388         case GLP_EBOUND:  ret = LPX_E_FAULT;   break;
  • glpk/src/glpmpl05.c

    diff -Naur glpk/src/glpmpl05.c.orig glpk/src/glpmpl05.c
     
    484484                  Sunday as the first day of the first week; days
    485485                  preceding the first Sunday in the year are considered
    486486                  to be in week 00 */
    487                int sun;
     487               int sunday;
    488488               /* sun = the first Sunday of the year */
    489                sun = jday(1, 1, year) - jday(1, 1, 1970);
    490                sun += (7 - weekday(sun));
    491                sprintf(buf, "%02d", (j + 7 - sun) / 7);
     489               sunday = jday(1, 1, year) - jday(1, 1, 1970);
     490               sunday += (7 - weekday(sunday));
     491               sprintf(buf, "%02d", (j + 7 - sunday) / 7);
    492492            }
    493493            else if (*f == 'V')
    494494            {  /* the ISO week number as a decimal number (range 01
Note: See TracBrowser for help on using the repository browser.