summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan@13f79535-47bb-0310-9956-ffa450edef68>2022-09-12 14:51:35 +0000
committerivan <ivan@13f79535-47bb-0310-9956-ffa450edef68>2022-09-12 14:51:35 +0000
commitf5468c0b61211b591c713bdf1b56060664030fa6 (patch)
treee7a377e9e642a3065854037aae3990fe942620bd
parent7f3eec3da627e9378612b68812d00ef72bae2a46 (diff)
downloadlibapr-f5468c0b61211b591c713bdf1b56060664030fa6.tar.gz
On 1.7.x branch: Merge r1901906 and r1901907 from 1.8.x branch.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1904013 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4632c3c0..8e78d95b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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