apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1529675 - in /apr/apr-util/branches/1.5.x: ./ CHANGES crypto/apr_crypto.c dbd/apr_dbd.c dbm/apr_dbm.c
Date Sun, 06 Oct 2013 20:08:37 GMT
Author: trawick
Date: Sun Oct  6 20:08:37 2013
New Revision: 1529675

URL: http://svn.apache.org/r1529675
Log:
Merge r1529554 from trunk:

APR DSOs have .dll extension on Cygwin too.

PR: 55587
Submitted by: Carlo Bramini <carlo.bramix libero.it>

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/CHANGES
    apr/apr-util/branches/1.5.x/crypto/apr_crypto.c
    apr/apr-util/branches/1.5.x/dbd/apr_dbd.c
    apr/apr-util/branches/1.5.x/dbm/apr_dbm.c

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1529554

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1529675&r1=1529674&r2=1529675&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Sun Oct  6 20:08:37 2013
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.3
 
+  *) Cygwin: Use correct file extension when loading APR DSOs.  PR 55587.
+     [Carlo Bramini <carlo.bramix libero.it>]
+
   *) Add experimental cmake-based build system for Windows.  Refer to
      README.cmake for more information.  [Jeff Trawick, Tom Donovan]
 

Modified: apr/apr-util/branches/1.5.x/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/crypto/apr_crypto.c?rev=1529675&r1=1529674&r2=1529675&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/crypto/apr_crypto.c (original)
+++ apr/apr-util/branches/1.5.x/crypto/apr_crypto.c Sun Oct  6 20:08:37 2013
@@ -178,7 +178,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "crypto%s.nlm", name);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
             "apr_crypto_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
 #else

Modified: apr/apr-util/branches/1.5.x/dbd/apr_dbd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbd/apr_dbd.c?rev=1529675&r1=1529674&r2=1529675&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbd/apr_dbd.c (original)
+++ apr/apr-util/branches/1.5.x/dbd/apr_dbd.c Sun Oct  6 20:08:37 2013
@@ -186,7 +186,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_dr
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
                  "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
 #else

Modified: apr/apr-util/branches/1.5.x/dbm/apr_dbm.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/dbm/apr_dbm.c?rev=1529675&r1=1529674&r2=1529675&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/dbm/apr_dbm.c (original)
+++ apr/apr-util/branches/1.5.x/dbm/apr_dbm.c Sun Oct  6 20:08:37 2013
@@ -164,7 +164,7 @@ static apr_status_t dbm_open_type(apr_db
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "dbm%s.nlm", type);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined (__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
                  "apr_dbm_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", type);
 #else



Mime
View raw message