blob: 349a1351feb0f923fa769f93862a250f2a4cfb17 [file] [log] [blame]
From 2108213242638fa355f662382f55495d91301858 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 30 Aug 2017 18:13:17 -0700
Subject: [PATCH 2/2] Fix build issues found with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
ruptime/ruptime.c | 1 +
rwho/rwho.c | 1 +
rwhod/rwhod.c | 5 +++--
3 files changed, 5 insertions(+), 2 deletions(-)
--- a/ruptime/ruptime.c
+++ b/ruptime/ruptime.c
@@ -53,6 +53,7 @@ char ruptime_rcsid[] =
#include <string.h>
#include <errno.h>
#include <time.h>
+#include <fcntl.h>
struct hs {
char hs_hostname[MAXHOSTNAMELEN];
--- a/rwho/rwho.c
+++ b/rwho/rwho.c
@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/0
#include <assert.h>
#include <stdio.h>
#include <time.h>
+#include <fcntl.h>
#include <protocols/rwhod.h>
#include "../version.h"
--- a/rwhod/rwhod.c
+++ b/rwhod/rwhod.c
@@ -76,6 +76,7 @@ char rcsid[] =
#include <grp.h>
#include <time.h>
#include <stdint.h>
+#include <fcntl.h>
#include "../version.h"
@@ -102,7 +103,7 @@ struct nlist nl[] = {
static void broadcaster(void);
static int configure(int s);
static int verify(const char *name);
-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)
+#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2))
static int getloadavg(double ptr[3], int n);
#endif
@@ -549,7 +550,7 @@ sendpacket(struct whod *wd)
}
}
-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)
+#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2))
/*
* Taken from:
*
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.h
@@ -37,6 +37,7 @@
#ifndef _RWHOD_H_
#define _RWHOD_H_
+#include <stdint.h>
/*
* rwho protocol packet format.
*/