← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/makedate.h
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#ifndef DRIZZLED_FUNCTIONS_TIME_MAKEDATE_H
21
 
#define DRIZZLED_FUNCTIONS_TIME_MAKEDATE_H
 
20
#ifndef DRIZZLED_FUNCTION_TIME_MAKEDATE_H
 
21
#define DRIZZLED_FUNCTION_TIME_MAKEDATE_H
22
22
 
23
 
#include <drizzled/functions/time/date.h>
 
23
#include <drizzled/function/time/date.h>
24
24
 
25
25
class Item_func_makedate :public Item_date_func
26
26
{
37
37
  int64_t val_int();
38
38
};
39
39
 
40
 
#endif /* DRIZZLED_FUNCTIONS_TIME_MAKEDATE_H */
 
40
#endif /* DRIZZLED_FUNCTION_TIME_MAKEDATE_H */