vanhofen
4 years ago
2 changed files with 67 additions and 0 deletions
@ -0,0 +1,44 @@ |
|||||
|
From 22f8d25567b8d64bdbab0fb0b4915b4362561d9b Mon Sep 17 00:00:00 2001 |
||||
|
From: Alexander Kanavin <alex.kanavin@gmail.com> |
||||
|
Date: Wed, 24 Feb 2021 21:14:31 +0000 |
||||
|
Subject: [PATCH] w.c: correct musl builds |
||||
|
|
||||
|
No need to redefine UT_ stuff to something that does not exist. |
||||
|
|
||||
|
UT_ is already provided in musl but via utmp.h header, so include |
||||
|
it always. |
||||
|
|
||||
|
Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] |
||||
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
||||
|
---
|
||||
|
w.c | 9 +-------- |
||||
|
1 file changed, 1 insertion(+), 8 deletions(-) |
||||
|
|
||||
|
diff --git a/w.c b/w.c
|
||||
|
index 9d07ac9..d10639b 100644
|
||||
|
--- a/w.c
|
||||
|
+++ b/w.c
|
||||
|
@@ -57,9 +57,8 @@
|
||||
|
#include <unistd.h> |
||||
|
#ifdef HAVE_UTMPX_H |
||||
|
# include <utmpx.h> |
||||
|
-#else
|
||||
|
-# include <utmp.h>
|
||||
|
#endif |
||||
|
+#include <utmp.h>
|
||||
|
#include <arpa/inet.h> |
||||
|
|
||||
|
static int ignoreuser = 0; /* for '-u' */ |
||||
|
@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t;
|
||||
|
typedef struct utmp utmp_t; |
||||
|
#endif |
||||
|
|
||||
|
-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE)
|
||||
|
-# define UT_HOSTSIZE __UT_HOSTSIZE
|
||||
|
-# define UT_LINESIZE __UT_LINESIZE
|
||||
|
-# define UT_NAMESIZE __UT_NAMESIZE
|
||||
|
-#endif
|
||||
|
-
|
||||
|
#ifdef W_SHOWFROM |
||||
|
# define FROM_STRING "on" |
||||
|
#else |
@ -0,0 +1,23 @@ |
|||||
|
From 4f964821398dff7ab21fec63da15e1e00b2e9277 Mon Sep 17 00:00:00 2001 |
||||
|
From: Alexander Kanavin <alex.kanavin@gmail.com> |
||||
|
Date: Wed, 24 Feb 2021 21:16:14 +0000 |
||||
|
Subject: [PATCH] proc/escape.c: add missing include |
||||
|
|
||||
|
Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/126] |
||||
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
||||
|
---
|
||||
|
proc/escape.c | 1 + |
||||
|
1 file changed, 1 insertion(+) |
||||
|
|
||||
|
diff --git a/proc/escape.c b/proc/escape.c
|
||||
|
index 2e8fb7d..e1f4612 100644
|
||||
|
--- a/proc/escape.c
|
||||
|
+++ b/proc/escape.c
|
||||
|
@@ -21,6 +21,7 @@
|
||||
|
#include <sys/types.h> |
||||
|
#include <string.h> |
||||
|
#include <limits.h> |
||||
|
+#include <langinfo.h>
|
||||
|
#include "procps.h" |
||||
|
#include "escape.h" |
||||
|
#include "readproc.h" |
Loading…
Reference in new issue