P4 to Git Change 1151344 by nhaustov@nhaustov_hsa1 on 2015/05/15 06:37:04

ECR #333756 - Avoid including sys/param.h in libelf.h to avoid name conflict with SC sources.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/elf_strptr.c#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/elf_update.c#11 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/loaders/elf/utils/libelf/libelf.h#10 edit

rocclr/compiler/lib/loaders/elf/utils/libelf/elf_strptr.c

@@ -31,6 +31,8 @@
 
 #ifdef ANDROID
 #include "roundup.h"
+#else
+#include <sys/param.h>
 #endif
 
 LIBELF_VCSID("$Id: elf_strptr.c 189 2008-07-20 10:38:08Z jkoshy $");

rocclr/compiler/lib/loaders/elf/utils/libelf/elf_update.c

@@ -54,6 +54,8 @@
 
 #ifdef ANDROID
 #include "roundup.h"
+#else
+#include <sys/param.h>
 #endif
 
 LIBELF_VCSID("$Id: elf_update.c 1922 2011-09-23 08:04:33Z jkoshy $");

rocclr/compiler/lib/loaders/elf/utils/libelf/libelf.h

@@ -29,7 +29,6 @@
 #ifndef	_LIBELF_H_
 #define	_LIBELF_H_
 
-#include <sys/param.h>
 #include <sys/queue.h>
 #include <elfdefinitions.h>
 #ifdef ANDROID