mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-19 10:10:06 +02:00
49 lines
1.3 KiB
Plaintext
49 lines
1.3 KiB
Plaintext
From a617ad82183769147818333d3b3bd6f8ea9c7a84 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
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 c9660b93bef99d169913343abd3e308621949ab7 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
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
|
|
|