← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/cslib/CSConfig.h

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/cslib/CSConfig.h
36
36
// in other headers. So the only safe thing I can think of is to include it in all source code
37
37
// files.
38
38
#ifdef DRIZZLED
39
 
#include <config.h>
 
39
#include "config.h"
40
40
#include <drizzled/common.h>
41
41
#else
42
42
#include "my_global.h"
48
48
#if defined(WIN32) ||  defined(WIN64) 
49
49
#include "win_config.h"
50
50
#else
51
 
#include <config.h>
 
51
#include "config.h"
52
52
#endif
53
53
 
54
54
#endif // defined(MYSQL_SERVER) ||  defined(DRIZZLED)