diff options
| author | Han Genuit <hangenuit@gmail.com> | 2012-02-21 14:26:36 +0100 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-04-15 11:26:00 -0600 |
| commit | b0b4afcbf2883e40ddee7a60348caf0736612260 (patch) | |
| tree | f53a3d7efa0b9a99110098d36cefae5ed7986a3f | |
| parent | bc6159a6ff307d45828100b7a575bfc51c5c2c6b (diff) | |
| download | numpy-b0b4afcbf2883e40ddee7a60348caf0736612260.tar.gz | |
ENH: Use get_mktime as wrapper for mktime.
| -rw-r--r-- | numpy/core/src/multiarray/datetime_strings.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/numpy/core/src/multiarray/datetime_strings.c b/numpy/core/src/multiarray/datetime_strings.c index 3e5a1b70a..e9e344ae2 100644 --- a/numpy/core/src/multiarray/datetime_strings.c +++ b/numpy/core/src/multiarray/datetime_strings.c @@ -269,10 +269,8 @@ convert_datetimestruct_local_to_utc(npy_datetimestruct *out_dts_utc, tm_.tm_isdst = -1; /* mktime converts a local 'struct tm' into a time_t */ - rawtime = mktime(&tm_); + rawtime = get_mktime(&tm_); if (rawtime == -1) { - PyErr_SetString(PyExc_OSError, "Failed to use mktime to " - "convert local time to UTC"); return -1; } |