← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

merge with latest from the trunk

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
 
20
#ifndef DRIZZLED_FUNCTION_TIME_MAKE_DATETIME_H
 
21
#define DRIZZLED_FUNCTION_TIME_MAKE_DATETIME_H
22
22
 
23
23
bool make_datetime(date_time_format_types format,
24
24
                   DRIZZLE_TIME *ltime,
25
25
                   String *str);
26
26
 
27
27
 
28
 
#endif /* DRIZZLED_FUNCTIONS_TIME_MAKE_DATETIME_H */
 
28
#endif /* DRIZZLED_FUNCTION_TIME_MAKE_DATETIME_H */