diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-12-26 22:46:19 -0800 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-12-26 22:46:19 -0800 |
| commit | 7a0c495cdd0e07e6e8430db96aed98510845c0c2 (patch) | |
| tree | 053c0e924ebb92a79d23957bf4ab3c7a76125875 | |
| parent | db671db12269c6aedfbfcabfb2f17b991b44d1d0 (diff) | |
| parent | 15022cbfc5fdbae023fae3b8384459d2dee07c53 (diff) | |
| download | numpy-7a0c495cdd0e07e6e8430db96aed98510845c0c2.tar.gz | |
Merge pull request #2856 from certik/fix568
FIX: Use the NPY_TIME_T macro everywhere
| -rw-r--r-- | numpy/core/src/multiarray/datetime_strings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/datetime_strings.c b/numpy/core/src/multiarray/datetime_strings.c index 32009bb79..b5ded4cd3 100644 --- a/numpy/core/src/multiarray/datetime_strings.c +++ b/numpy/core/src/multiarray/datetime_strings.c @@ -189,7 +189,7 @@ convert_datetimestruct_utc_to_local(npy_datetimestruct *out_dts_local, * we drop the seconds value from the npy_datetimestruct, everything * is ok for this operation. */ - rawtime = (time_t)get_datetimestruct_days(out_dts_local) * 24 * 60 * 60; + rawtime = (NPY_TIME_T)get_datetimestruct_days(out_dts_local) * 24 * 60 * 60; rawtime += dts_utc->hour * 60 * 60; rawtime += dts_utc->min * 60; @@ -207,7 +207,7 @@ convert_datetimestruct_utc_to_local(npy_datetimestruct *out_dts_local, /* Extract the timezone offset that was applied */ rawtime /= 60; - localrawtime = (time_t)get_datetimestruct_days(out_dts_local) * 24 * 60; + localrawtime = (NPY_TIME_T)get_datetimestruct_days(out_dts_local) * 24 * 60; localrawtime += out_dts_local->hour * 60; localrawtime += out_dts_local->min; |