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 C96D4138334 for ; Sat, 21 Sep 2019 20:23:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0A35E0937; Sat, 21 Sep 2019 20:23:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B56D4E0937 for ; Sat, 21 Sep 2019 20:23:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 957FE34B447 for ; Sat, 21 Sep 2019 20:23:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87095218 for ; Sat, 21 Sep 2019 20:23:01 +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: <1569097282.909489d4317eb4d1dddc1da95d08f365e39dc7b7.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: q.c qmanifest.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 909489d4317eb4d1dddc1da95d08f365e39dc7b7 X-VCS-Branch: master Date: Sat, 21 Sep 2019 20:23:01 +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: aa686f30-b1d5-4aba-87ec-77ebe527a03d X-Archives-Hash: 4ae386b3d84aac0a09693c725da6fefa commit: 909489d4317eb4d1dddc1da95d08f365e39dc7b7 Author: Matija Skala gmx com> AuthorDate: Mon Sep 16 20:51:59 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Sep 21 20:21:22 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=909489d4 fix compile on hurd Signed-off-by: Fabian Groffen gentoo.org> q.c | 4 ++-- qmanifest.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/q.c b/q.c index 3dd49f7..c03fd66 100644 --- a/q.c +++ b/q.c @@ -15,7 +15,7 @@ #include #include -#if defined(__MACH__) +#if defined(__MACH__) && defined(__APPLE__) #include #endif @@ -113,7 +113,7 @@ int q_main(int argc, char **argv) if (!quiet) printf("Installing symlinks:\n"); -#if defined(__MACH__) +#if defined(__MACH__) && defined(__APPLE__) rret = proc_pidpath(getpid(), buf, sizeof(buf)); if (rret != -1) rret = strlen(buf); diff --git a/qmanifest.c b/qmanifest.c index 41faa4c..10cd39c 100644 --- a/qmanifest.c +++ b/qmanifest.c @@ -91,7 +91,7 @@ char verify_manifest(const char *dir, const char *manifest, verify_msg **msgs); static inline void update_times(struct timeval *tv, struct stat *s) { -#ifdef __MACH__ +#ifdef __MACH__ && defined __APPLE__ # define st_mtim st_mtimespec # define st_atim st_atimespec #endif