apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1363065 - in /apr/apr-util/branches/1.5.x: ./ crypto/apr_md5.c crypto/apr_passwd.c
Date Wed, 18 Jul 2012 19:35:19 GMT
Author: sf
Date: Wed Jul 18 19:35:18 2012
New Revision: 1363065

URL: http://svn.apache.org/viewvc?rev=1363065&view=rev
Log:
Merge r1358480 from apr trunk:

Fix NetWare build with picky Metrowerks compiler.

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/crypto/apr_md5.c
    apr/apr-util/branches/1.5.x/crypto/apr_passwd.c

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

Modified: apr/apr-util/branches/1.5.x/crypto/apr_md5.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/crypto/apr_md5.c?rev=1363065&r1=1363064&r2=1363065&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/crypto/apr_md5.c (original)
+++ apr/apr-util/branches/1.5.x/crypto/apr_md5.c Wed Jul 18 19:35:18 2012
@@ -468,7 +468,7 @@ APU_DECLARE(apr_status_t) apr_MD5InitEBC
  * Define the Magic String prefix that identifies a password as being
  * hashed using our algorithm.
  */
-static const char const *apr1_id = "$apr1$";
+static const char * const apr1_id = "$apr1$";
 
 /*
  * The following MD5 password encryption code was largely borrowed from

Modified: apr/apr-util/branches/1.5.x/crypto/apr_passwd.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/crypto/apr_passwd.c?rev=1363065&r1=1363064&r2=1363065&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/crypto/apr_passwd.c (original)
+++ apr/apr-util/branches/1.5.x/crypto/apr_passwd.c Wed Jul 18 19:35:18 2012
@@ -33,7 +33,7 @@
 #include <pthread.h>
 #endif
 
-static const char const *apr1_id = "$apr1$";
+static const char * const apr1_id = "$apr1$";
 
 #if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
 #if defined(APU_CRYPT_THREADSAFE) || !APR_HAS_THREADS || \
@@ -150,7 +150,7 @@ APU_DECLARE(apr_status_t) apr_password_v
     return (strcmp(sample, hash) == 0) ? APR_SUCCESS : APR_EMISMATCH;
 }
 
-static const char const *bcrypt_id = "$2y$";
+static const char * const bcrypt_id = "$2y$";
 APU_DECLARE(apr_status_t) apr_bcrypt_encode(const char *pw,
                                             unsigned int count,
                                             const unsigned char *salt,



Mime
View raw message