Drizzle

Merge lp:~trond-norbye/drizzle/pcre-fix into lp:~drizzle-trunk/drizzle/development

  1. pcre-fix
  2. Merge into development
Proposed by Trond Norbye
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trond-norbye/drizzle/pcre-fix
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: None lines
To merge this branch: bzr merge lp:~trond-norbye/drizzle/pcre-fix
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+7959@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Trond Norbye (trond-norbye) wrote :

Don't use <pcre.h> directly, because newer versions of pcre install the file as <pcre/pcre.h>.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/logging_query/logging_query.cc'
2--- plugin/logging_query/logging_query.cc 2009-06-05 02:52:09 +0000
3+++ plugin/logging_query/logging_query.cc 2009-06-26 19:05:00 +0000
4@@ -21,7 +21,7 @@
5 #include <drizzled/plugin/logging_handler.h>
6 #include <drizzled/gettext.h>
7 #include <drizzled/session.h>
8-#include <pcre.h>
9+#include PCRE_HEADER
10
11 /* TODO make this dynamic as needed */
12 static const int MAX_MSG_LEN= 32*1024;