← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/heapdef.h

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/heapdef.h
15
15
 
16
16
/* This file is included in all heap-files */
17
17
 
18
 
#include <my_base.h>                    /* This includes global */
 
18
#include <drizzled/base.h>              /* This includes global */
19
19
C_MODE_START
20
 
#include <my_pthread.h>
 
20
#include <mysys/my_pthread.h>
21
21
#include "heap.h"                       /* Structs & some defines */
22
 
#include "my_tree.h"
 
22
#include <mysys/my_tree.h>
23
23
 
24
24
/*
25
25
  When allocating keys /rows in the internal block structure, do it