← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/single_thread/single_thread.h

Merge trunk and resolve all conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/single_thread/single_thread.h
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
 
#include <drizzled/server_includes.h>
 
16
#ifndef PLUGIN_SINGLE_THREAD_SINGLE_THREAD_H
 
17
#define PLUGIN_SINGLE_THREAD_SINGLE_THREAD_H
 
18
 
17
19
#include <drizzled/gettext.h>
18
20
#include <drizzled/error.h>
19
21
#include <drizzled/plugin/scheduler.h>
59
61
    my_thread_end();
60
62
  }
61
63
};
 
64
 
 
65
#endif /* PLUGIN_SINGLE_THREAD_SINGLE_THREAD_H */