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

Last change on this file since 1229 was 1229, checked in by lou, 12 years ago

Changes to work with Solaris patch. Remove diff commands, leave a blank line
between diffs.

File size: 1.3 KB
  • 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

    old new  
    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.