8
8
*
9
9
* Copyright (c) 1994, Regents of the University of California
10
10
*
11
- * $Id: dt.h,v 1.23 1997/12/16 15:55:17 thomas Exp $
11
+ * $Id: dt.h,v 1.24 1997/12/17 23:19:28 thomas Exp $
12
12
*
13
13
*-------------------------------------------------------------------------
14
14
*/
@@ -271,7 +271,7 @@ extern bool datetime_le(DateTime *dt1, DateTime *dt2);
271
271
extern bool datetime_ge (DateTime * dt1 ,DateTime * dt2 );
272
272
extern bool datetime_gt (DateTime * dt1 ,DateTime * dt2 );
273
273
extern bool datetime_finite (DateTime * datetime );
274
- extern int datetime_cmp (DateTime * dt1 ,DateTime * dt2 );
274
+ extern int datetime_cmp (DateTime * dt1 ,DateTime * dt2 );
275
275
extern DateTime * datetime_smaller (DateTime * dt1 ,DateTime * dt2 );
276
276
extern DateTime * datetime_larger (DateTime * dt1 ,DateTime * dt2 );
277
277
@@ -284,13 +284,14 @@ extern bool timespan_le(TimeSpan *span1, TimeSpan *span2);
284
284
extern bool timespan_ge (TimeSpan * span1 ,TimeSpan * span2 );
285
285
extern bool timespan_gt (TimeSpan * span1 ,TimeSpan * span2 );
286
286
extern bool timespan_finite (TimeSpan * span );
287
- extern int timespan_cmp (TimeSpan * span1 ,TimeSpan * span2 );
287
+ extern int timespan_cmp (TimeSpan * span1 ,TimeSpan * span2 );
288
288
extern TimeSpan * timespan_smaller (TimeSpan * span1 ,TimeSpan * span2 );
289
289
extern TimeSpan * timespan_larger (TimeSpan * span1 ,TimeSpan * span2 );
290
290
291
291
extern text * datetime_text (DateTime * datetime );
292
292
extern DateTime * text_datetime (text * str );
293
293
extern text * timespan_text (TimeSpan * timespan );
294
+ extern TimeSpan * text_timespan (text * str );
294
295
extern DateTime * datetime_trunc (text * units ,DateTime * datetime );
295
296
extern TimeSpan * timespan_trunc (text * units ,TimeSpan * timespan );
296
297
extern float64 datetime_part (text * units ,DateTime * datetime );
@@ -309,11 +310,13 @@ extern TimeSpan *datetime_age(DateTime *dt1, DateTime *dt2);
309
310
310
311
extern void GetCurrentTime (struct tm * tm );
311
312
extern DateTime SetDateTime (DateTime datetime );
312
- extern int tm2datetime (struct tm * tm ,double fsec ,int * tzp ,DateTime * dt );
313
+ extern int tm2datetime (struct tm * tm ,double fsec ,int * tzp ,DateTime * dt );
313
314
extern int datetime2tm (DateTime dt ,int * tzp ,struct tm * tm ,double * fsec ,char * * tzn );
315
+ extern int timespan2tm (TimeSpan span ,struct tm * tm ,float8 * fsec );
316
+ extern int tm2timespan (struct tm * tm ,double fsec ,TimeSpan * span );
314
317
315
318
extern void j2date (int jd ,int * year ,int * month ,int * day );
316
- extern int date2j (int year ,int month ,int day );
319
+ extern int date2j (int year ,int month ,int day );
317
320
318
321
extern double time2t (const int hour ,const int min ,const double sec );
319
322
@@ -332,9 +335,9 @@ extern int
332
335
DecodeDateDelta (char * field [],int ftype [],
333
336
int nf ,int * dtype ,struct tm * tm ,double * fsec );
334
337
335
- extern int EncodeDateOnly (struct tm * tm ,int style ,char * str );
336
- extern int EncodeTimeOnly (struct tm * tm ,double fsec ,int style ,char * str );
337
- extern int EncodeDateTime (struct tm * tm ,double fsec ,int * tzp ,char * * tzn ,int style ,char * str );
338
- extern int EncodeTimeSpan (struct tm * tm ,double fsec ,int style ,char * str );
338
+ extern int EncodeDateOnly (struct tm * tm ,int style ,char * str );
339
+ extern int EncodeTimeOnly (struct tm * tm ,double fsec ,int style ,char * str );
340
+ extern int EncodeDateTime (struct tm * tm ,double fsec ,int * tzp ,char * * tzn ,int style ,char * str );
341
+ extern int EncodeTimeSpan (struct tm * tm ,double fsec ,int style ,char * str );
339
342
340
343
#endif /* DT_H */