View Issue Details

IDProjectCategoryView StatusLast Update
0000615Other Unix PortBugpublic2014-07-10 21:20
ReporterkomhAssigned To 
PrioritynormalSeveritymajorReproducibilityalways
Status newResolutionopen 
Summary0000615: Fix compilation of apr-util-1.4.1
DescriptionHi/2.

compilation of apr-util-1.4.1 fails when multi-thread enabled.
TagsNo tags attached.

Activities

komh

2014-07-10 21:20

reporter  

0001-apr_md5-fix-compilation-with-multi-thread-enabled-on.patch (1,274 bytes)
From e4178f33fb0c4c20675a8aea012edc966ebc6f88 Mon Sep 17 00:00:00 2001
From: KO Myung-Hun <komh@chollian.net>
Date: Mon, 21 Apr 2014 21:10:48 +0900
Subject: [PATCH] apr_md5: fix compilation with multi-thread enabled on OS/2

---
 crypto/apr_md5.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/apr_md5.c b/crypto/apr_md5.c
index 691cc87..9c29af6 100644
--- a/crypto/apr_md5.c
+++ b/crypto/apr_md5.c
@@ -661,7 +661,7 @@ APU_DECLARE(apr_status_t) apr_md5_encode(const char *pw, const char *salt,
     return APR_SUCCESS;
 }
 
-#if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE) && !defined(__OS2__)
 #if defined(APU_CRYPT_THREADSAFE) || !APR_HAS_THREADS || \
     defined(CRYPT_R_CRYPTD) || defined(CRYPT_R_STRUCT_CRYPT_DATA)
 
@@ -715,7 +715,7 @@ APU_DECLARE(apr_status_t) apr_password_validate(const char *passwd,
         /*
          * It's not our algorithm, so feed it to crypt() if possible.
          */
-#if defined(WIN32) || defined(BEOS) || defined(NETWARE)
+#if defined(WIN32) || defined(BEOS) || defined(NETWARE) || defined(__OS2__)
         apr_cpystrn(sample, passwd, sizeof(sample) - 1);
 #elif defined(CRYPT_R_CRYPTD)
         CRYPTD buffer;
-- 
1.7.3.2

Issue History

Date Modified Username Field Change
2014-07-10 21:20 komh New Issue
2014-07-10 21:20 komh File Added: 0001-apr_md5-fix-compilation-with-multi-thread-enabled-on.patch