# HG changeset patch # User John Donoghue # Date 1452806743 18000 # Node ID d5757727d1ddd93f4af167f15b8fc7bc2837e059 # Parent fc075c6c9a0b8e9253238943d2a472c092574f34 glpk: Prevent crash when using glpk glp_time in mingw * src/src/mingw-glpk-1-fixes.patch: new file diff -r fc075c6c9a0b -r d5757727d1dd src/mingw-glpk-1-fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-glpk-1-fixes.patch Thu Jan 14 16:25:43 2016 -0500 @@ -0,0 +1,30 @@ +diff -ur glpk-4.55.orig/src/env/time.c glpk-4.55/src/env/time.c +--- glpk-4.55.orig/src/env/time.c 2016-01-14 09:41:16.135339481 -0500 ++++ glpk-4.55/src/env/time.c 2016-01-14 09:48:05.279096864 -0500 +@@ -44,9 +44,24 @@ + + #define EPOCH 2440588 /* jday(1, 1, 1970) */ + +-/* POSIX version ******************************************************/ ++#if defined(__MINGW32__) ++ ++#include + +-#if defined(HAVE_SYS_TIME_H) && defined(HAVE_GETTIMEOFDAY) ++double glp_time(void) ++{ SYSTEMTIME st; ++ int j; ++ double t; ++ GetSystemTime(&st); ++ j = jday(st.wDay, st.wMonth, st.wYear); ++ xassert(j >= 0); ++ t = ((((double)(j - EPOCH) * 24.0 + (double)st.wHour) * 60.0 + ++ (double)st.wMinute) * 60.0 + (double)st.wSecond) * 1000.0 + ++ (double)st.wMilliseconds; ++ return t; ++} ++/* POSIX version ******************************************************/ ++#elif defined(HAVE_SYS_TIME_H) && defined(HAVE_GETTIMEOFDAY) + + #include + #include