From edb2e5269bc67ed332ac12da5f0cb985a6d25ef3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 20 Oct 2020 18:10:27 +0200 Subject: rusage is incomplete diff --git a/apps/json_parse.c b/apps/json_parse.c index bba4622..706a6b3 100644 --- a/apps/json_parse.c +++ b/apps/json_parse.c @@ -38,12 +38,14 @@ static int showobj(struct json_object *new_obj); static void showmem(void) { +#ifndef __HAIKU__ #ifdef HAVE_GETRUSAGE struct rusage rusage; memset(&rusage, 0, sizeof(rusage)); getrusage(RUSAGE_SELF, &rusage); printf("maxrss: %ld KB\n", rusage.ru_maxrss); #endif +#endif } static int parseit(int fd, int (*callback)(struct json_object *)) -- 2.37.3 From d3066a66c1c2b7038ad44be8d835eb0066f09cd1 Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 25 Dec 2022 11:46:12 +0100 Subject: Fix install for $includeDir diff --git a/CMakeLists.txt b/CMakeLists.txt index 99ab904..04482af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -494,4 +494,4 @@ if (UNIX OR MINGW OR CYGWIN) install(FILES ${PROJECT_BINARY_DIR}/json-c.pc DESTINATION "${INSTALL_PKGCONFIG_DIR}") endif () -install(FILES ${JSON_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/json-c) +install(FILES ${JSON_C_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/json-c) -- 2.37.3 From d0b066b5e84b0660ac5165daaa981f2e220b6565 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 3 Jan 2023 10:13:36 +1000 Subject: Use setlocale instead uselocale diff --git a/CMakeLists.txt b/CMakeLists.txt index 04482af..3cc2d41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,7 +177,7 @@ if (HAVE_STDLIB_H) endif() if (HAVE_LOCALE_H) check_symbol_exists(setlocale "locale.h" HAVE_SETLOCALE) - check_symbol_exists(uselocale "locale.h" HAVE_USELOCALE) +# check_symbol_exists(uselocale "locale.h" HAVE_USELOCALE) endif() if (HAVE_STRINGS_H) check_symbol_exists(strcasecmp "strings.h" HAVE_STRCASECMP) -- 2.37.3