From 7e452fdc8fac49bd6446c82cb22b3c92cad379e4 Mon Sep 17 00:00:00 2001 From: "Ramesh Errabolu (xN/A) TX" Date: Tue, 24 Mar 2015 19:17:26 -0500 Subject: [PATCH] ECR #333755 - Updates to build Hsa Samples on Windows for Non-Prm branch [git-p4: depot-paths = "//depot/stg/hsa/drivers/hsa/runtime/": change = 1134033] [ROCm/ROCR-Runtime commit: 13d77a9c6b6c744c38fae76f8418972b0208e505] --- projects/rocr-runtime/samples/common/os.cpp | 90 ++++++++++----------- projects/rocr-runtime/samples/common/os.h | 24 +++--- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/projects/rocr-runtime/samples/common/os.cpp b/projects/rocr-runtime/samples/common/os.cpp index 6ec575fb99..3d64d3ba29 100755 --- a/projects/rocr-runtime/samples/common/os.cpp +++ b/projects/rocr-runtime/samples/common/os.cpp @@ -1,45 +1,45 @@ -#ifdef _WIN32 // Compiling for Windows Platform - -#include -#include -#include "os.h" -#include - -void SetEnv(const char* env_var_name, const char* env_var_value) { - bool err = SetEnvironmentVariable(env_var_name, env_var_value); - if(false == err){ - printf("Set environment variable failed!\n"); - exit(1); - } - return; -} - -char* GetEnv(const char* env_var_name){ - char* buff; - DWORD char_count = GetEnvironmentVariable(env_var_name, NULL, 0); - if (char_count == 0) return NULL; - buff = (char*)malloc(sizeof(char) * char_count); - GetEnvironmentVariable(env_var_name, buff, char_count); - buff[char_count - 1] = '\0'; - return buff; -} - -#elif defined(__linux__) - -#include "os.h" -#include - -void SetEnv(const char* env_var_name, const char* env_var_value){ - int err = setenv(env_var_name, env_var_value, 1); - if(0 != err){ - printf("Set environment variable failed!\n"); - exit(1); - } - return; -} - -char* GetEnv(const char* env_var_name) { - return getenv(env_var_name); -} - -#endif +#ifdef _WIN32 // Compiling for Windows Platform + +#include +#include +#include "os.h" +#include + +void SetEnv(const char* env_var_name, const char* env_var_value) { + BOOL err = SetEnvironmentVariable(env_var_name, env_var_value); + if(FALSE == err){ + printf("Set environment variable failed!\n"); + exit(1); + } + return; +} + +char* GetEnv(const char* env_var_name){ + char* buff; + DWORD char_count = GetEnvironmentVariable(env_var_name, NULL, 0); + if (char_count == 0) return NULL; + buff = (char*)malloc(sizeof(char) * char_count); + GetEnvironmentVariable(env_var_name, buff, char_count); + buff[char_count - 1] = '\0'; + return buff; +} + +#elif defined(__linux__) + +#include "os.h" +#include + +void SetEnv(const char* env_var_name, const char* env_var_value){ + int err = setenv(env_var_name, env_var_value, 1); + if(0 != err){ + printf("Set environment variable failed!\n"); + exit(1); + } + return; +} + +char* GetEnv(const char* env_var_name) { + return getenv(env_var_name); +} + +#endif diff --git a/projects/rocr-runtime/samples/common/os.h b/projects/rocr-runtime/samples/common/os.h index 69dd7fa61c..ded5ad88f5 100755 --- a/projects/rocr-runtime/samples/common/os.h +++ b/projects/rocr-runtime/samples/common/os.h @@ -1,12 +1,12 @@ -#ifndef HSA_PERF_SRC_UTILS_OS_H_ -#define HSA_PERF_SRC_UTILS_OS_H_ - -#include - -// Set envriroment variable -void SetEnv(const char* env_var_name, const char* env_var_value); - -// Get the value of enviroment -char* GetEnv(const char* env_var_name); - -#endif +#ifndef HSA_PERF_SRC_UTILS_OS_H_ +#define HSA_PERF_SRC_UTILS_OS_H_ + +#include + +// Set envriroment variable +void SetEnv(const char* env_var_name, const char* env_var_value); + +// Get the value of enviroment +char* GetEnv(const char* env_var_name); + +#endif