← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/int64_t.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/int64_t.h
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#ifndef DRIZZLE_SERVER_FIELD_INT_64_T
22
 
#define DRIZZLE_SERVER_FIELD_INT_64_T
 
21
#ifndef DRIZZLED_FIELD_INT64_T_H
 
22
#define DRIZZLED_FIELD_INT64_T_H
23
23
 
24
24
#include <drizzled/field/num.h>
25
25
 
79
79
 
80
80
};
81
81
 
82
 
#endif
 
82
#endif /* DRIZZLED_FIELD_INT64_T_H */