From 268a359cf41966af3b59b10db5499d107fedd651 Mon Sep 17 00:00:00 2001 From: premysl Date: Thu, 6 Aug 2015 21:14:19 +0200 Subject: Bump liberty Pulling in kqueue support. --- CMakeLists.txt | 6 ++++++ liberty | 2 +- ponymap.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35d3688..4a7f421 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,12 @@ set (project_VERSION "${project_VERSION_MAJOR}") set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}") set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}") +if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD") + # Need this in FreeBSD and OpenBSD respectively; + # our POSIX version macros make it undefined + add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1) +endif ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD") + # Dependencies find_package (Curses) find_package (PkgConfig REQUIRED) diff --git a/liberty b/liberty index 8c6d187..1a305a1 160000 --- a/liberty +++ b/liberty @@ -1 +1 @@ -Subproject commit 8c6d18757d2d4135963f3dbab6d2d5ec8c8b6af3 +Subproject commit 1a305a1c6b1608219334d7512fc09081c9066c9e diff --git a/ponymap.c b/ponymap.c index 2726675..ca1e58c 100644 --- a/ponymap.c +++ b/ponymap.c @@ -1777,9 +1777,9 @@ list_foreach (const char *list, list_foreach_fn callback, void *user_data) str_vector_init (&items); bool success = false; - split_str_ignore_empty (list, ',', &items); + cstr_split_ignore_empty (list, ',', &items); for (size_t i = 0; i < items.len; i++) - if (!callback (user_data, strip_str_in_place (items.vector[i], " "))) + if (!callback (user_data, cstr_strip_in_place (items.vector[i], " "))) goto fail; success = true; -- cgit v1.2.3-70-g09d2