← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/md5/md5.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/md5/md5.cc
15
15
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
16
16
 
17
17
#include "config.h"
18
 
#include <drizzled/plugin/function.h>
19
 
#include <drizzled/item/func.h>
20
 
#include <drizzled/function/str/strfunc.h>
 
18
 
 
19
/* Include these before the openssl headers, because they are BROKEN AS CRAP */
 
20
#include <cstdio>
 
21
#include <cstddef>
21
22
 
22
23
#if defined(HAVE_LIBGNUTLS_OPENSSL)
23
24
# include <gnutls/openssl.h>
25
26
# include <openssl/md5.h>
26
27
#endif /* HAVE_GNUTLS_OPENSSL */
27
28
 
28
 
#include <stdio.h>
 
29
#include <drizzled/plugin/function.h>
 
30
#include <drizzled/item/func.h>
 
31
#include "drizzled/charset.h"
 
32
#include <drizzled/function/str/strfunc.h>
29
33
 
30
34
using namespace std;
31
35
using namespace drizzled;