From 9de153ce9192c99d65cc6bf643ae0576c142c736 Mon Sep 17 00:00:00 2001
From: "Yaxun (Sam) Liu" <yaxun.liu@amd.com>
Date: Mon, 25 Jun 2018 15:55:02 -0400
Subject: [PATCH] Include stddef.h in device_functions.h and remove use of
 uint8_t

[ROCm/hip commit: e22c35e124a226ecb338b66b911e878b19905404]
---
 .../hip/include/hip/hcc_detail/device_functions.h     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/projects/hip/include/hip/hcc_detail/device_functions.h b/projects/hip/include/hip/hcc_detail/device_functions.h
index 17d908be6d..ab14727f11 100644
--- a/projects/hip/include/hip/hcc_detail/device_functions.h
+++ b/projects/hip/include/hip/hcc_detail/device_functions.h
@@ -26,6 +26,7 @@ THE SOFTWARE.
 #include "host_defines.h"
 
 #include <hip/hip_vector_types.h>
+#include <stddef.h>
 
 extern "C" __device__ unsigned int __hip_hc_ir_umul24_int(unsigned int, unsigned int);
 extern "C" __device__ signed int __hip_hc_ir_mul24_int(signed int, signed int);
@@ -212,8 +213,8 @@ __device__ char4 __hip_hc_mul8pk(char4, char4);
 
 // loop unrolling
 static inline __device__ void* __hip_hc_memcpy(void* dst, const void* src, size_t size) {
-    auto dstPtr = static_cast<uint8_t*>(dst);
-    auto srcPtr = static_cast<const uint8_t*>(src);
+    auto dstPtr = static_cast<unsigned char*>(dst);
+    auto srcPtr = static_cast<const unsigned char*>(src);
 
     while (size >= 4u) {
         dstPtr[0] = srcPtr[0];
@@ -237,8 +238,8 @@ static inline __device__ void* __hip_hc_memcpy(void* dst, const void* src, size_
     return dst;
 }
 
-static inline __device__ void* __hip_hc_memset(void* dst, uint8_t val, size_t size) {
-    auto dstPtr = static_cast<uint8_t*>(dst);
+static inline __device__ void* __hip_hc_memset(void* dst, unsigned char val, size_t size) {
+    auto dstPtr = static_cast<unsigned char*>(dst);
 
     while (size >= 4u) {
         dstPtr[0] = val;
@@ -265,7 +266,7 @@ static inline __device__ void* memcpy(void* dst, const void* src, size_t size) {
 }
 
 static inline __device__ void* memset(void* ptr, int val, size_t size) {
-    uint8_t val8 = static_cast<uint8_t>(val);
+    unsigned char val8 = static_cast<unsigned char>(val);
     return __hip_hc_memset(ptr, val8, size);
 }
 #endif