|
 |
155cffa |
From c43b072b89f19e9b41d45bdf3946593ae9bc6e5e Mon Sep 17 00:00:00 2001
|
|
|
155cffa |
From: christos <christos>
|
|
|
155cffa |
Date: Mon, 24 Aug 2015 07:08:42 +0000
|
|
|
155cffa |
Subject: [PATCH 1/2] restrict BSDWAIT to __GLIBC__ because other linux
|
|
|
155cffa |
libraries (muslc) don't have the macros.
|
|
|
155cffa |
|
|
|
155cffa |
---
|
|
|
155cffa |
sh.proc.c | 2 +-
|
|
|
155cffa |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
155cffa |
|
|
|
155cffa |
diff --git a/sh.proc.c b/sh.proc.c
|
|
|
155cffa |
index 76eca3b..ad07250 100644
|
|
|
155cffa |
--- a/sh.proc.c
|
|
|
155cffa |
+++ b/sh.proc.c
|
|
|
155cffa |
@@ -47,7 +47,7 @@ RCSID("$tcsh$")
|
|
|
155cffa |
# define HZ 16
|
|
|
155cffa |
#endif /* aiws */
|
|
|
155cffa |
|
|
|
155cffa |
-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
|
|
|
155cffa |
+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GLIBC__)
|
|
|
155cffa |
# if !defined(__ANDROID__)
|
|
|
155cffa |
# define BSDWAIT
|
|
|
155cffa |
# endif
|
|
|
155cffa |
--
|
|
|
155cffa |
2.5.5
|
|
|
155cffa |
|
|
|
155cffa |
|
|
|
155cffa |
From eab72f9797ec4faaf1fb4de491c357f194b84dd6 Mon Sep 17 00:00:00 2001
|
|
|
155cffa |
From: christos <christos>
|
|
|
155cffa |
Date: Thu, 14 Apr 2016 11:09:09 +0000
|
|
|
155cffa |
Subject: [PATCH 2/2] GLIBC is getting rid of union wait.
|
|
|
155cffa |
|
|
|
155cffa |
---
|
|
|
155cffa |
sh.proc.c | 6 +++---
|
|
|
155cffa |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
155cffa |
|
|
|
155cffa |
diff --git a/sh.proc.c b/sh.proc.c
|
|
|
155cffa |
index ad07250..5c68409 100644
|
|
|
155cffa |
--- a/sh.proc.c
|
|
|
155cffa |
+++ b/sh.proc.c
|
|
|
155cffa |
@@ -47,11 +47,11 @@ RCSID("$tcsh$")
|
|
|
155cffa |
# define HZ 16
|
|
|
155cffa |
#endif /* aiws */
|
|
|
155cffa |
|
|
|
155cffa |
-#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GLIBC__)
|
|
|
155cffa |
-# if !defined(__ANDROID__)
|
|
|
155cffa |
+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__)
|
|
|
155cffa |
+# if !defined(__ANDROID__) && !defined(__GLIBC__)
|
|
|
155cffa |
# define BSDWAIT
|
|
|
155cffa |
# endif
|
|
|
155cffa |
-#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || glibc */
|
|
|
155cffa |
+#endif /* _BSD || (IRIS4D && __STDC__) || __lucid || gnu-linux */
|
|
|
155cffa |
#ifndef WTERMSIG
|
|
|
155cffa |
# define WTERMSIG(w) (((union wait *) &(w))->w_termsig)
|
|
|
155cffa |
# ifndef BSDWAIT
|
|
|
155cffa |
--
|
|
|
155cffa |
2.5.5
|
|
|
155cffa |
|