Changeset 1228 for ThirdParty/Glpk/trunk


Ignore:
Timestamp:
Jan 3, 2009 12:18:19 PM (11 years ago)
Author:
stefan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/glpk.patch

    r1226 r1228  
    1111          case GLP_ECOND:
    1212          case GLP_EBOUND:  ret = LPX_E_FAULT;   break;
     13diff -Naur glpk/src/glpmpl05.c.orig glpk/src/glpmpl05.c
     14--- glpk/src/glpmpl05.c 2008-12-04 10:00:00.000000000 +0100
     15+++ glpk/src/glpmpl05.c 2009-01-03 18:14:11.000000000 +0100
     16@@ -484,11 +484,11 @@
     17                   Sunday as the first day of the first week; days
     18                   preceding the first Sunday in the year are considered
     19                   to be in week 00 */
     20-               int sun;
     21+               int sunday;
     22                /* sun = the first Sunday of the year */
     23-               sun = jday(1, 1, year) - jday(1, 1, 1970);
     24-               sun += (7 - weekday(sun));
     25-               sprintf(buf, "%02d", (j + 7 - sun) / 7);
     26+               sunday = jday(1, 1, year) - jday(1, 1, 1970);
     27+               sunday += (7 - weekday(sunday));
     28+               sprintf(buf, "%02d", (j + 7 - sunday) / 7);
     29             }
     30             else if (*f == 'V')
     31             {  /* the ISO week number as a decimal number (range 01
Note: See TracChangeset for help on using the changeset viewer.