Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Sat, 21 Sep 2019 20:23:05
Message-Id: 1569097282.909489d4317eb4d1dddc1da95d08f365e39dc7b7.grobian@gentoo
1 commit: 909489d4317eb4d1dddc1da95d08f365e39dc7b7
2 Author: Matija Skala <mskala <AT> gmx <DOT> com>
3 AuthorDate: Mon Sep 16 20:51:59 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 21 20:21:22 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=909489d4
7
8 fix compile on hurd
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 q.c | 4 ++--
13 qmanifest.c | 2 +-
14 2 files changed, 3 insertions(+), 3 deletions(-)
15
16 diff --git a/q.c b/q.c
17 index 3dd49f7..c03fd66 100644
18 --- a/q.c
19 +++ b/q.c
20 @@ -15,7 +15,7 @@
21 #include <sys/stat.h>
22 #include <fcntl.h>
23
24 -#if defined(__MACH__)
25 +#if defined(__MACH__) && defined(__APPLE__)
26 #include <libproc.h>
27 #endif
28
29 @@ -113,7 +113,7 @@ int q_main(int argc, char **argv)
30 if (!quiet)
31 printf("Installing symlinks:\n");
32
33 -#if defined(__MACH__)
34 +#if defined(__MACH__) && defined(__APPLE__)
35 rret = proc_pidpath(getpid(), buf, sizeof(buf));
36 if (rret != -1)
37 rret = strlen(buf);
38
39 diff --git a/qmanifest.c b/qmanifest.c
40 index 41faa4c..10cd39c 100644
41 --- a/qmanifest.c
42 +++ b/qmanifest.c
43 @@ -91,7 +91,7 @@ char verify_manifest(const char *dir, const char *manifest, verify_msg **msgs);
44 static inline void
45 update_times(struct timeval *tv, struct stat *s)
46 {
47 -#ifdef __MACH__
48 +#ifdef __MACH__ && defined __APPLE__
49 # define st_mtim st_mtimespec
50 # define st_atim st_atimespec
51 #endif