← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_alloc.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_alloc.h
17
17
   Data structures for mysys/my_alloc.c (root memory allocator)
18
18
*/
19
19
 
20
 
#ifndef _my_alloc_h
21
 
#define _my_alloc_h
 
20
#ifndef MYSYS_MY_ALLOC_H
 
21
#define MYSYS_MY_ALLOC_H
22
22
 
23
23
#include <stddef.h>
24
24
#include <drizzled/definitions.h>
71
71
#if defined(__cplusplus)
72
72
}
73
73
#endif
74
 
#endif
 
74
#endif /* MYSYS_MY_ALLOC_H */