From nobody Wed Oct 27 11:21:51 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 98A8B1822ACD; Wed, 27 Oct 2021 11:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfR9C3WLqz4tP6; Wed, 27 Oct 2021 11:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E4317343; Wed, 27 Oct 2021 11:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RBLpJd062072; Wed, 27 Oct 2021 11:21:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RBLpr2062071; Wed, 27 Oct 2021 11:21:51 GMT (envelope-from git) Date: Wed, 27 Oct 2021 11:21:51 GMT Message-Id: <202110271121.19RBLpr2062071@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 8608e04e8e62 - main - net-p2p/gtk-gnutella: fix build on powerpc* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8608e04e8e62835aabcb71736fa3613335e7e1d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=8608e04e8e62835aabcb71736fa3613335e7e1d3 commit 8608e04e8e62835aabcb71736fa3613335e7e1d3 Author: Piotr Kubaj AuthorDate: 2021-10-27 11:19:34 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-27 11:19:34 +0000 net-p2p/gtk-gnutella: fix build on powerpc* Rename callframe to fix redefinition: memusage.c:538:8: error: redefinition of 'callframe' struct callframe { ^ /usr/include/machine/frame.h:88:8: note: previous definition is here struct callframe { --- .../gtk-gnutella/files/patch-src_lib_memusage.c | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/net-p2p/gtk-gnutella/files/patch-src_lib_memusage.c b/net-p2p/gtk-gnutella/files/patch-src_lib_memusage.c new file mode 100644 index 000000000000..79a5e75e7df3 --- /dev/null +++ b/net-p2p/gtk-gnutella/files/patch-src_lib_memusage.c @@ -0,0 +1,59 @@ +--- src/lib/memusage.c.orig 2021-10-27 02:46:02 UTC ++++ src/lib/memusage.c +@@ -535,25 +535,25 @@ memusage_set_stack_accounting(memusage_t *mu, bool on) + MEMUSAGE_THREAD_UNLOCK(mu); + } + +-struct callframe { ++struct callframes { + size_t calls; + const struct stackatom *frame; + const struct memusage_counter *mc; + }; + + /** +- * qsort() callback for sorting callframe items by decreasing call amount. ++ * qsort() callback for sorting callframes items by decreasing call amount. + */ + static int + callframe_cmp(const void *p1, const void *p2) + { +- const struct callframe *f1 = p1, *f2 = p2; ++ const struct callframes *f1 = p1, *f2 = p2; + + return CMP(f2->calls, f1->calls); /* Decreasing order */ + } + + struct callframe_filler { +- struct callframe *array; ++ struct callframes *array; + size_t capacity; + size_t count; + const memusage_t *mu; +@@ -568,7 +568,7 @@ callframe_filler_add(const void *key, void *value, voi + { + struct callframe_filler *filler = data; + struct memusage_counter *mc = value; +- struct callframe *f; ++ struct callframes *f; + + memusage_counter_check(mc); + g_assert(filler->count < filler->capacity); +@@ -648,7 +648,7 @@ memusage_sort_frames(const memusage_t *mu, bool period + static void + memusage_sorted_frame_dump_log(logagent_t *la, const memusage_t *mu, + const char *name, const char *what, +- struct callframe *array, size_t count, hash_table_t *all, size_t recurses) ++ struct callframes *array, size_t count, hash_table_t *all, size_t recurses) + { + size_t i; + const char *event; +@@ -664,7 +664,7 @@ memusage_sorted_frame_dump_log(logagent_t *la, const m + event = (0 == mu->width) ? "size" : "calls"; + + for (i = 0; i < count; i++) { +- struct callframe *cf = &array[i]; ++ struct callframes *cf = &array[i]; + struct memusage_counter *mc; + size_t total; +