← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin.h

  • Committer: Eric Day
  • Date: 2010-03-25 19:28:37 UTC
  • mfrom: (1405 staging)
  • mto: This revision was merged to the branch mainline in revision 1409.
  • Revision ID: eday@oddments.org-20100325192837-4exmacbrywjovsqp
Merged trunk, rsolved conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin.h
26
26
#include <drizzled/plugin/module.h>
27
27
#include "drizzled/plugin/version.h"
28
28
#include "drizzled/definitions.h"
 
29
#include "drizzled/plugin/context.h"
29
30
 
30
31
 
31
32
namespace drizzled
66
67
 
67
68
 
68
69
#define DRIZZLE_DECLARE_PLUGIN_END
69
 
#define DRIZZLE_PLUGIN(init,deinit,system) \
 
70
#define DRIZZLE_PLUGIN(init,system) \
70
71
  DRIZZLE_DECLARE_PLUGIN \
71
72
  { \
72
73
    DRIZZLE_VERSION_ID, \
75
76
    STRINGIFY_ARG(PANDORA_MODULE_AUTHOR), \
76
77
    STRINGIFY_ARG(PANDORA_MODULE_TITLE), \
77
78
    PANDORA_MODULE_LICENSE, \
78
 
    init, deinit, system, NULL \
 
79
    init, system, NULL \
79
80
  } 
80
81
 
81
82