← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/make_datetime.h

  • Committer: Brian Aker
  • Date: 2008-12-15 07:27:18 UTC
  • mfrom: (670.1.24 devel)
  • Revision ID: brian@tangent.org-20081215072718-uf9nak79262b8snk
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/make_datetime.h
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#ifndef DRIZZLED_FUNCTIONS_TIME_MAKE_DATETIME_H
21
 
#define DRIZZLED_FUNCTIONS_TIME_MAKE_DATETIME_H
22
 
 
23
 
#include <drizzled/item/timefunc.h>
 
20
#ifndef DRIZZLED_FUNCTION_TIME_MAKE_DATETIME_H
 
21
#define DRIZZLED_FUNCTION_TIME_MAKE_DATETIME_H
24
22
 
25
23
bool make_datetime(date_time_format_types format,
26
24
                   DRIZZLE_TIME *ltime,
27
25
                   String *str);
28
26
 
29
27
 
30
 
#endif /* DRIZZLED_FUNCTIONS_TIME_MAKE_DATETIME_H */
 
28
#endif /* DRIZZLED_FUNCTION_TIME_MAKE_DATETIME_H */