From 3f973726f87c4a11545972e182d9cac92751dd20 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Fri, 15 May 2015 07:20:20 -0400
Subject: [PATCH] P4 to Git Change 1151350 by nhaustov@spb-hlc-kv500_hsa on
 2015/05/15 07:11:40

	ECR #333756 - Fix includes.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/_libelf.h#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/libelf.h#11 edit
---
 rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h | 1 +
 rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h  | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h b/rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h
index 23d21b3661..0fcf2859ec 100644
--- a/rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h
+++ b/rocclr/compiler/lib/loaders/elf/utils/libelf/_libelf.h
@@ -29,6 +29,7 @@
 #ifndef	__LIBELF_H_
 #define	__LIBELF_H_
 
+#include <limits.h>
 #include <sys/queue.h>
 
 #include "_libelf_config.h"
diff --git a/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h b/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
index a3adf744c2..a13c9d45c4 100644
--- a/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
+++ b/rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h
@@ -29,11 +29,9 @@
 #ifndef	_LIBELF_H_
 #define	_LIBELF_H_
 
+#include <sys/types.h>
 #include <sys/queue.h>
 #include <elfdefinitions.h>
-#ifdef ANDROID
-#include "sys/types.h"
-#endif
 #ifndef EM_HSAIL
 #define EM_HSAIL 0xAF5A
 #endif