apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ruediger Pluem <rpl...@apache.org>
Subject Re: svn commit: r799780 - /apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c
Date Sat, 01 Aug 2009 07:42:17 GMT


On 08/01/2009 02:40 AM, wrowe@apache.org wrote:
> Author: wrowe
> Date: Sat Aug  1 00:40:40 2009
> New Revision: 799780
> 
> URL: http://svn.apache.org/viewvc?rev=799780&view=rev
> Log:
> Reorder the config into sanity, prefer include/mysql/ structure
> if found, and *be consistent*.
> 
> On Win32, perhaps others, including my_* foo before mysql.h
> results in broken includes.
> 
> Modified:
>     apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c
> 
> Modified: apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c
> URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c?rev=799780&r1=799779&r2=799780&view=diff
> ==============================================================================
> --- apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c (original)
> +++ apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c Sat Aug  1 00:40:40 2009
> @@ -15,7 +15,6 @@
>   */
>  
>  #include "apu.h"
> -#define HAVE_MYSQL_MYSQL_H
>  
>  #if APU_HAVE_MYSQL
>  
> @@ -25,22 +24,20 @@
>  #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)
> +#include <mysql/mysql.h>
> +#include <mysql/errmsg.h>
> +#if defined(HAVE_MYSQL_MY_GLOBAL_H) && defined(HAVE_MYSQL_MY_SYS_H)
>  #include <mysql/my_global.h>
> +#include <mysql/mysql.h>

Shouldn't this be

#include <mysql/my_sys.h>

instead above?

Regards

RĂ¼diger


Mime
View raw message