apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r564528 - /apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
Date Fri, 10 Aug 2007 09:34:09 GMT
Author: jorton
Date: Fri Aug 10 02:34:08 2007
New Revision: 564528

URL: http://svn.apache.org/viewvc?view=rev&rev=564528
Log:
Merge r564526 from trunk:

* dbd/apr_dbd.c (apr_dbd_open): Recent glibc defines open() as a macro
(as permitted by POSIX); prevent expansion of such here.

Modified:
    apr/apr-util/branches/1.2.x/dbd/apr_dbd.c

Modified: apr/apr-util/branches/1.2.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/dbd/apr_dbd.c?view=diff&rev=564528&r1=564527&r2=564528
==============================================================================
--- apr/apr-util/branches/1.2.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.2.x/dbd/apr_dbd.c Fri Aug 10 02:34:08 2007
@@ -162,7 +162,7 @@
                                        apr_dbd_t **handle)
 {
     apr_status_t rv;
-    *handle = driver->open(pool, params);
+    *handle = (driver->open)(pool, params);
     if (*handle == NULL) {
         return APR_EGENERAL;
     }



Mime
View raw message