summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorHecklezz <tj8@live.com.au>2025-10-22 19:27:51 +1000
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-10-22 15:46:36 +0300
commitab3106d58e2abe9fc3a9e74ac20ada9ca46a7f46 (patch)
tree4ec955f764ea0fb217e6c2fb1ff2a97f619bddfd /indra
parentb4090c24d25c202eb68be8bcd129d524d155e739 (diff)
Updated APR library and removed hotfix patch in APR cmake
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/APR.cmake5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 310659686d..e0807a7d19 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -31,8 +31,3 @@ if(DARWIN)
endif()
target_include_directories(ll::apr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/apr-1)
-
-# Fix erroneous check for __attribute__ definition introduced with APR 1.7.5, causing lots of "this declaration may not have extern 'C' linkage" errors in VS
-file(READ ${LIBS_PREBUILT_DIR}/include/apr-1/apr.h APR_HEADER_CONTENTS)
-string(REPLACE "#if !(defined(__attribute__) || defined(__has_attribute))" "#if !defined(__attribute__)" APR_HEADER_CONTENTS "${APR_HEADER_CONTENTS}")
-file(WRITE ${LIBS_PREBUILT_DIR}/include/apr-1/apr.h "${APR_HEADER_CONTENTS}")