You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2022/09/12 14:51:35 UTC
svn commit: r1904013 - in /apr/apr/branches/1.7.x: ./ CMakeLists.txt
Author: ivan
Date: Mon Sep 12 14:51:35 2022
New Revision: 1904013
URL: http://svn.apache.org/viewvc?rev=1904013&view=rev
Log:
On 1.7.x branch: Merge r1901906 and r1901907 from 1.8.x branch.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/CMakeLists.txt
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/branches/1.8.x:r1901906-1901907
Merged /apr/apr/trunk:r1858331-1858333
Modified: apr/apr/branches/1.7.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CMakeLists.txt?rev=1904013&r1=1904012&r2=1904013&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.7.x/CMakeLists.txt Mon Sep 12 14:51:35 2022
@@ -131,7 +131,9 @@ SET(APR_PUBLIC_HEADERS_GENERATED
SET(APR_SOURCES
atomic/win32/apr_atomic.c
+ atomic/win32/apr_atomic64.c
dso/win32/dso.c
+ encoding/apr_encode.c
encoding/apr_escape.c
file_io/unix/copy.c
file_io/unix/fileacc.c
@@ -215,6 +217,7 @@ SET(APR_TEST_SOURCES
test/testdso.c
test/testdup.c
test/testenv.c
+ test/testencode.c
test/testescape.c
test/testfile.c
test/testfilecopy.c