← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/drizzle_time.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/drizzle_time.h
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#ifndef _libdrizzle_drizzle_time_h
22
 
#define _libdrizzle_drizzle_time_h
 
21
#ifndef MYSYS_DRIZZLE_TIME_H
 
22
#define MYSYS_DRIZZLE_TIME_H
23
23
 
24
24
/*
25
25
  Time declarations shared between the server and client API:
57
57
  enum enum_drizzle_timestamp_type time_type;
58
58
} DRIZZLE_TIME;
59
59
 
60
 
#endif /* _libdrizzle_drizzle_time_h */
 
60
#endif /* MYSYS_DRIZZLE_TIME_H */