diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2009-08-03 19:28:26 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2009-08-03 19:28:26 +0000 |
| commit | bac2365d5c7d50f701764812f5783439efbc35f7 (patch) | |
| tree | 313307db15ac60601b31af6df62447f61f4d1f72 /dbd | |
| parent | c25d1d6e4f1b6c18bf31dee05605767225790d8e (diff) | |
| download | apr-bac2365d5c7d50f701764812f5783439efbc35f7.tar.gz | |
Reorder the config into sanity, prefer include/mysql/ structure
if found, and *be consistent*. Includes rpluem's patch to
maintain load order of these cleaned up includes.
It appears my_sys.h is actually not required for my_init(), and it
certainly won't compile under Visual C/Win32. So carefully omit it
only on platforms where my_sys.h is not found/not usable, and retain
the existing unix compilation.
Forward ports: 799780, 800402, 800431
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@800505 13f79535-47bb-0310-9956-ffa450edef68
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" |