Put 'internally public' datetime functions in _datetime header.

We use _datetime.h to avoid clashes with python datetime.h

3 files changed, 21 insertions, 0 deletions

diff --git a/numpy/core/src/multiarray/_datetime.h b/numpy/core/src/multiarray/_datetime.h
new file mode 100644
index 000000000..cd4cc0b67
--- /dev/null
+++ b/numpy/core/src/multiarray/_datetime.h
@@ -0,0 +1,18 @@
+#ifndef _NPY_PRIVATE__DATETIME_H_
+#define _NPY_PRIVATE__DATETIME_H_
+
+NPY_NO_EXPORT void 
+PyArray_DatetimeToDatetimeStruct(npy_datetime val, NPY_DATETIMEUNIT fr, 
+				 npy_datetimestruct *result);
+
+NPY_NO_EXPORT void 
+PyArray_TimedeltaToTimedeltaStruct(npy_timedelta val, NPY_DATETIMEUNIT fr, 
+				 npy_timedeltastruct *result);
+
+NPY_NO_EXPORT npy_datetime
+PyArray_DatetimeStructToDatetime(NPY_DATETIMEUNIT fr, npy_datetimestruct *d);
+
+NPY_NO_EXPORT npy_datetime
+PyArray_TimedeltaStructToTimedelta(NPY_DATETIMEUNIT fr, npy_timedeltastruct *d);
+
+#endif
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 8f1e8dcd1..e54aac667 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -16,6 +16,7 @@
 #include "ctors.h"
 #include "usertypes.h"
 #include "config.h"
+#include "_datetime.h"
 
 #include "numpyos.h"
 
diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c
index a9f0ab97a..79f4a733f 100644
--- a/numpy/core/src/multiarray/datetime.c
+++ b/numpy/core/src/multiarray/datetime.c
@@ -6,6 +6,8 @@
 
 #include <time.h>
 
+#include "_datetime.h"
+
 /* For defaults and errors */
 #define NPY_FR_ERR  -1