Mercurial > mxe-octave
view src/mingw-glpk-1-fixes.patch @ 4449:1933a9113e65
of-*: add octave as a dependancy to the of packages is binary enable is set (Bug #46235)
* src/of-actuarial.mk, src/of-communications.mk, src/of-control.mk, src/of-data-smoothing.mk,
src/of-database.mk, src/of-dataframe.mk, src/of-dicom.mk, src/of-financial.mk, src/of-fits.mk,
src/of-fl-core.mk, src/of-fuzzy-logic-toolkit.mk, src/of-ga.mk, src/of-general.mk, src/of-generate_html.mk,
src/of-geometry.mk, src/of-gsl.mk, src/of-image.mk, src/of-instrument-control.mk, src/of-interval.mk,
src/of-io.mk, src/of-linear-algebra.mk, src/of-lssa.mk, src/of-ltfat.mk, src/of-mapping.mk,
src/of-miscellaneous.mk, src/of-nan.mk, src/of-netcdf.mk, src/of-nurbs.mk, src/of-ocs.mk, src/of-octcdf.mk,
src/of-odepkg.mk, src/of-optim.mk, src/of-quaternion.mk, src/of-queueing.mk, src/of-signal.mk, src/of-sockets.mk,
src/of-sparsersb.mk, src/of-specfun.mk, src/of-splines.mk, src/of-statistics.mk, src/of-stk.mk,
src/of-strings.mk, src/of-struct.mk, src/of-tisean.mk, src/of-tsa.mk, src/of-video.mk, src/of-windows.mk,
src/of-zenity.mk, src/of-zeromq.mk: add $(PKG)_DEPS += $(OCTAVE_TARGET) if ENABLE_BINARY_PACKAGES = yes
author | John D |
---|---|
date | Mon, 14 Aug 2017 09:12:34 -0400 |
parents | d5757727d1dd |
children |
line wrap: on
line source
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 <windows.h> -#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 <sys/time.h> #include <time.h>