From 6319aebe8968e3e4cd8d1ca5cf2073a6e2a948dc Mon Sep 17 00:00:00 2001 From: Lubos Dolezel Date: Fri, 28 Feb 2020 23:38:49 +0100 Subject: [PATCH] Fix a crash when 'launchctl load' is run --- platform-include/xpc/{launchd.h => launchd_defs.h} | 0 src/external/foundation | 2 +- src/external/libxpc | 2 +- src/launchd/src/CMakeLists.txt | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) rename platform-include/xpc/{launchd.h => launchd_defs.h} (100%) diff --git a/platform-include/xpc/launchd.h b/platform-include/xpc/launchd_defs.h similarity index 100% rename from platform-include/xpc/launchd.h rename to platform-include/xpc/launchd_defs.h diff --git a/src/external/foundation b/src/external/foundation index 02e6e7170..c0f817f75 160000 --- a/src/external/foundation +++ b/src/external/foundation @@ -1 +1 @@ -Subproject commit 02e6e717030f17d172c54de414767f29db2872ea +Subproject commit c0f817f756e071d154addc4f337ac8c38baf5d9d diff --git a/src/external/libxpc b/src/external/libxpc index c2d653aa3..206faca6f 160000 --- a/src/external/libxpc +++ b/src/external/libxpc @@ -1 +1 @@ -Subproject commit c2d653aa363f4b937b93b5386c09dd3f9e480edb +Subproject commit 206faca6f356e7c7678eb6943ff3f7105b389e64 diff --git a/src/launchd/src/CMakeLists.txt b/src/launchd/src/CMakeLists.txt index de8114433..135a04a36 100644 --- a/src/launchd/src/CMakeLists.txt +++ b/src/launchd/src/CMakeLists.txt @@ -21,6 +21,7 @@ add_definitions( include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../liblaunch + ${CMAKE_SOURCE_DIR}/src/external/libxpc ) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fblocks -nostdinc -include ${CMAKE_SOURCE_DIR}/kernel-include/sys/fileport.h") -- 2.51.2