diff options
Diffstat (limited to 'dbd')
-rw-r--r-- | dbd/apr_dbd_mysql.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c index 95a92477a..482b82a96 100644 --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c @@ -15,7 +15,6 @@ */ #include "apu.h" -#define HAVE_MYSQL_MYSQL_H #if APU_HAVE_MYSQL @@ -25,22 +24,24 @@ #include <ctype.h> #include <stdlib.h> -#ifdef HAVE_MY_GLOBAL_H -#include <my_global.h> -#elif defined(HAVE_MYSQL_MY_GLOBAL_H) +#if defined(HAVE_MYSQL_MYSQL_H) +#if defined(HAVE_MYSQL_MY_GLOBAL_H) #include <mysql/my_global.h> +#if defined(HAVE_MYSQL_MY_SYS_H) +#include <mysql/my_sys.h> +#endif #endif -#ifdef HAVE_MY_SYS_H +#include <mysql/mysql.h> +#include <mysql/errmsg.h> +#else /* !defined(HAVE_MYSQL_MYSQL_H) */ +#if defined(HAVE_MY_GLOBAL_H) +#include <my_global.h> +#if defined(HAVE_MY_SYS_H) #include <my_sys.h> -#elif defined(HAVE_MYSQL_MY_SYS_H) -#include <mysql/my_sys.h> #endif -#ifdef HAVE_MYSQL_H +#endif #include <mysql.h> #include <errmsg.h> -#elif defined(HAVE_MYSQL_MYSQL_H) -#include <mysql/mysql.h> -#include <mysql/errmsg.h> #endif #include "apr_strings.h" |