Move declarations for timespan2tm() and tm2timespan() from dt.c to here.

diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h
index 6843c6175747255b4916b127d8bd4ded904e6665..c74a63cd2726fd541104c596182f9d765e01903c 100644 (file)
--- a/src/include/utils/dt.h
+++ b/src/include/utils/dt.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.23 1997/12/16 15:55:17 thomas Exp $
+ * $Id: dt.h,v 1.24 1997/12/17 23:19:28 thomas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -271,7 +271,7 @@ extern bool datetime_le(DateTime *dt1, DateTime *dt2);
 extern bool datetime_ge(DateTime *dt1, DateTime *dt2);
 extern bool datetime_gt(DateTime *dt1, DateTime *dt2);
 extern bool datetime_finite(DateTime *datetime);
-extern int     datetime_cmp(DateTime *dt1, DateTime *dt2);
+extern int datetime_cmp(DateTime *dt1, DateTime *dt2);
 extern DateTime *datetime_smaller(DateTime *dt1, DateTime *dt2);
 extern DateTime *datetime_larger(DateTime *dt1, DateTime *dt2);
 
@@ -284,13 +284,14 @@ extern bool timespan_le(TimeSpan *span1, TimeSpan *span2);
 extern bool timespan_ge(TimeSpan *span1, TimeSpan *span2);
 extern bool timespan_gt(TimeSpan *span1, TimeSpan *span2);
 extern bool timespan_finite(TimeSpan *span);
-extern int     timespan_cmp(TimeSpan *span1, TimeSpan *span2);
+extern int timespan_cmp(TimeSpan *span1, TimeSpan *span2);
 extern TimeSpan *timespan_smaller(TimeSpan *span1, TimeSpan *span2);
 extern TimeSpan *timespan_larger(TimeSpan *span1, TimeSpan *span2);
 
 extern text *datetime_text(DateTime *datetime);
 extern DateTime *text_datetime(text *str);
 extern text *timespan_text(TimeSpan *timespan);
+extern TimeSpan *text_timespan(text *str);
 extern DateTime *datetime_trunc(text *units, DateTime *datetime);
 extern TimeSpan *timespan_trunc(text *units, TimeSpan *timespan);
 extern float64 datetime_part(text *units, DateTime *datetime);
@@ -309,11 +310,13 @@ extern TimeSpan *datetime_age(DateTime *dt1, DateTime *dt2);
 
 extern void GetCurrentTime(struct tm * tm);
 extern DateTime SetDateTime(DateTime datetime);
-extern int     tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt);
+extern int tm2datetime(struct tm * tm, double fsec, int *tzp, DateTime *dt);
 extern int  datetime2tm(DateTime dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
+extern int timespan2tm(TimeSpan span, struct tm * tm, float8 *fsec);
+extern int tm2timespan(struct tm * tm, double fsec, TimeSpan *span);
 
 extern void j2date(int jd, int *year, int *month, int *day);
-extern int     date2j(int year, int month, int day);
+extern int date2j(int year, int month, int day);
 
 extern double time2t(const int hour, const int min, const double sec);
 
@@ -332,9 +335,9 @@ extern int
 DecodeDateDelta(char *field[], int ftype[],
                                int nf, int *dtype, struct tm * tm, double *fsec);
 
-extern int     EncodeDateOnly(struct tm * tm, int style, char *str);
-extern int     EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str);
-extern int     EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str);
-extern int     EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str);
+extern int EncodeDateOnly(struct tm * tm, int style, char *str);
+extern int EncodeTimeOnly(struct tm * tm, double fsec, int style, char *str);
+extern int EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str);
+extern int EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str);
 
 #endif /* DT_H */