From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7F46138334 for ; Wed, 5 Jun 2019 07:57:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3758E090A; Wed, 5 Jun 2019 07:57:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D989AE090A for ; Wed, 5 Jun 2019 07:57:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E701D345745 for ; Wed, 5 Jun 2019 07:57:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 992F8603 for ; Wed, 5 Jun 2019 07:57:47 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1559721404.e074e6fa71c94cea6a6693822f33fc3ea6afc1d1.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/hash.c X-VCS-Directories: libq/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: e074e6fa71c94cea6a6693822f33fc3ea6afc1d1 X-VCS-Branch: master Date: Wed, 5 Jun 2019 07:57:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ed39d9d4-3346-448c-9a83-fdee85626767 X-Archives-Hash: 6edf3ce785a141ab70d636b68a8d17a8 commit: e074e6fa71c94cea6a6693822f33fc3ea6afc1d1 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jun 5 07:56:44 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Jun 5 07:56:44 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e074e6fa libq/hash: fix compilation without HAVE_SSL and HAVE_BLAKE2B Bug: https://bugs.gentoo.org/687374 Signed-off-by: Fabian Groffen gentoo.org> libq/hash.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libq/hash.c b/libq/hash.c index 8ce29d7..32d047a 100644 --- a/libq/hash.c +++ b/libq/hash.c @@ -131,6 +131,7 @@ hash_compute_file( while ((len = fread(data, 1, sizeof(data), f)) > 0) { *flen += len; +#if defined(HAVE_SSL) || defined(HAVE_BLAKE2B) #pragma omp parallel sections { #ifdef HAVE_SSL @@ -158,9 +159,11 @@ hash_compute_file( } #endif } +#endif /* HAVE_SSL || HAVE_BLAKE2B */ } fclose(f); +#if defined(HAVE_SSL) || defined(HAVE_BLAKE2B) #pragma omp parallel sections { #ifdef HAVE_SSL @@ -199,4 +202,5 @@ hash_compute_file( } #endif } +#endif /* HAVE_SSL || HAVE_BLAKE2B */ }