From 655aae6a79854e5cc995ca9fda8a985003f9024c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Sun, 30 Apr 2017 18:17:51 +0200
Subject: [PATCH] KPathTest: Fix build for GCC 5.

* Also fixed a warning in KPath.
* Sorry, again!
---
 src/system/kernel/fs/KPath.cpp           | 2 +-
 src/tests/system/kernel/fs/KPathTest.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/system/kernel/fs/KPath.cpp b/src/system/kernel/fs/KPath.cpp
index cacceb482a..3debfbf38f 100644
--- a/src/system/kernel/fs/KPath.cpp
+++ b/src/system/kernel/fs/KPath.cpp
@@ -123,7 +123,7 @@ KPath::Adopt(KPath& other)
 status_t
 KPath::InitCheck() const
 {
-	if (fBuffer != NULL || fLazy && !fFailed && fBufferSize != 0)
+	if (fBuffer != NULL || (fLazy && !fFailed && fBufferSize != 0))
 		return B_OK;
 
 	return fFailed ? B_NO_MEMORY : B_NO_INIT;
diff --git a/src/tests/system/kernel/fs/KPathTest.cpp b/src/tests/system/kernel/fs/KPathTest.cpp
index 5265330ed9..ff91c8f302 100644
--- a/src/tests/system/kernel/fs/KPathTest.cpp
+++ b/src/tests/system/kernel/fs/KPathTest.cpp
@@ -6,6 +6,7 @@
 
 #include "KPathTest.h"
 
+#include <stdlib.h>
 #include <string.h>
 
 #include <fs/KPath.h>