← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/myisam_priv.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/myisam_priv.h
15
15
 
16
16
/* This file is included by all internal myisam files */
17
17
 
18
 
#ifndef MYISAMDEF_H
19
 
#define MYISAMDEF_H
 
18
#ifndef PLUGIN_MYISAM_MYISAM_PRIV_H
 
19
#define PLUGIN_MYISAM_MYISAM_PRIV_H
20
20
 
21
21
#include <drizzled/global.h>
22
22
#include "myisam.h"                     /* Structs & some defines */
753
753
#endif
754
754
 
755
755
 
756
 
#endif /* MYISAMDEF_H */
 
756
#endif /* PLUGIN_MYISAM_MYISAM_PRIV_H */