apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r800431 - in /apr/apr-util/branches/1.3.x: dbd/apr_dbd_mysql.c include/private/apu_config.hw
Date Mon, 03 Aug 2009 15:46:24 GMT
Author: wrowe
Date: Mon Aug  3 15:46:24 2009
New Revision: 800431

URL: http://svn.apache.org/viewvc?rev=800431&view=rev
Log:
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.

Modified:
    apr/apr-util/branches/1.3.x/dbd/apr_dbd_mysql.c
    apr/apr-util/branches/1.3.x/include/private/apu_config.hw

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=800431&r1=800430&r2=800431&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 Mon Aug  3 15:46:24 2009
@@ -25,17 +25,21 @@
 #include <stdlib.h>
 
 #if defined(HAVE_MYSQL_MYSQL_H)
-#if defined(HAVE_MYSQL_MY_GLOBAL_H) && defined(HAVE_MYSQL_MY_SYS_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
 #include <mysql/mysql.h>
 #include <mysql/errmsg.h>
-#else
-#if defined(HAVE_MY_GLOBAL_H) && defined(HAVE_MY_SYS_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>
 #endif
+#endif
 #include <mysql.h>
 #include <errmsg.h>
 #endif

Modified: apr/apr-util/branches/1.3.x/include/private/apu_config.hw
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/include/private/apu_config.hw?rev=800431&r1=800430&r2=800431&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/include/private/apu_config.hw (original)
+++ apr/apr-util/branches/1.3.x/include/private/apu_config.hw Mon Aug  3 15:46:24 2009
@@ -31,6 +31,12 @@
 #define APU_DSO_BUILD           1
 #endif
 
+/* Presume a standard, modern (5.x) mysql sdk/
+#define HAVE_MY_GLOBAL_H        1
+
+/* my_sys.h is broken on VC/Win32, and apparently not required */
+/* #undef HAVE_MY_SYS_H           0 */
+
 /*
  * Windows does not have GDBM, and we always use the bundled (new) Expat
  */



Mime
View raw message