aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-09-06 12:47:55 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-09-06 12:47:55 +0200
commit043b1e5d997d9b582a5aee37bd56e2e4f29be6e4 (patch)
treebab07bc427f178857896a8bf252c61ea1a5c67a2 /libbb
parent5370bfb123266ab5716f321e43d3f8f6da7d7143 (diff)
downloadbusybox-043b1e5d997d9b582a5aee37bd56e2e4f29be6e4.tar.gz
busybox-043b1e5d997d9b582a5aee37bd56e2e4f29be6e4.tar.bz2
more C standard compat fixes from Dan Fandrich
function old new delta docolon 207 204 -3 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/kernel_version.c5
-rw-r--r--libbb/login.c4
-rw-r--r--libbb/xconnect.c1
3 files changed, 6 insertions, 4 deletions
diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index 8b9c4ec20..937d2dbfb 100644
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -7,9 +7,10 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include <sys/utsname.h> /* for uname(2) */
-
#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h> /* for uname(2) */
+
/* Returns current kernel version encoded as major*65536 + minor*256 + patch,
* so, for example, to check if the kernel is greater than 2.2.11:
diff --git a/libbb/login.c b/libbb/login.c
index ba9f4d2b5..07247a8c5 100644
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -9,9 +9,9 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include <sys/param.h> /* MAXHOSTNAMELEN */
-#include <sys/utsname.h>
#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
#define LOGIN " login: "
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 85f93b639..a18466935 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -7,6 +7,7 @@
* Licensed under GPLv2, see file LICENSE in this tarball for details.
*/
+#include <sys/socket.h> /* netinet/in.h needs it */
#include <netinet/in.h>
#include <net/if.h>
#include <sys/un.h>