← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/temporal.cc

  • Committer: Jay Pipes
  • Date: 2009-02-04 15:44:25 UTC
  • mfrom: (829 drizzle)
  • mto: This revision was merged to the branch mainline in revision 830.
  • Revision ID: jpipes@serialcoder-20090204154425-th8xfk2ujz2y8xwg
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/temporal.cc
36
36
 
37
37
#include "drizzled/global.h"
38
38
 
39
 
#include <vector>
40
 
#include <string.h>
41
 
 
42
39
#include "mystrings/m_ctype.h"
43
40
#include "drizzled/my_decimal.h"
44
41
#include "drizzled/temporal.h"
45
42
#include "drizzled/temporal_format.h"
46
43
 
 
44
#include <vector>
 
45
#include <string.h>
 
46
 
 
47
/* time.h may already have been included in global.h, but we
 
48
   need to pick up the extra defs as well, after the global time.h */
 
49
#ifndef HAVE_DECL_TIMEGM
 
50
# include <gnulib/time.h>
 
51
#endif
 
52
 
47
53
extern std::vector<drizzled::TemporalFormat *> known_datetime_formats;
48
54
extern std::vector<drizzled::TemporalFormat *> known_date_formats;
49
55
extern std::vector<drizzled::TemporalFormat *> known_time_formats;