diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/cancel.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/cancel.cu --- a/openmp/libomptarget/deviceRTLs/nvptx/src/cancel.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/cancel.cu @@ -16,12 +16,12 @@ int32_t cancelVal) { PRINT(LD_IO, "call kmpc_cancellationpoint(cancel val %d)\n", (int)cancelVal); // disabled - return FALSE; + return 0; } EXTERN int32_t __kmpc_cancel(kmp_Ident *loc, int32_t global_tid, int32_t cancelVal) { PRINT(LD_IO, "call kmpc_cancel(cancel val %d)\n", (int)cancelVal); // disabled - return FALSE; + return 0; } diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/debug.h b/openmp/libomptarget/deviceRTLs/nvptx/src/debug.h --- a/openmp/libomptarget/deviceRTLs/nvptx/src/debug.h +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/debug.h @@ -195,7 +195,7 @@ } #else -#define DON(_flag) (FALSE) +#define DON(_flag) (0) #define PRINT0(flag, str) #define PRINT(flag, str, _args...) @@ -247,7 +247,7 @@ #else -#define TON(_flag) (FALSE) +#define TON(_flag) (0) #define ASSERT0(_flag, _cond, _str) #define ASSERT(_flag, _cond, _str, _args...) @@ -279,7 +279,7 @@ #else -#define WON(_flag) (FALSE) +#define WON(_flag) (0) #define WARNING0(_flag, _str) #define WARNING(_flag, _str, _args...) diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu --- a/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/libcall.cu @@ -286,7 +286,7 @@ } EXTERN int omp_get_cancellation(void) { - int rc = FALSE; // currently false only + int rc = 0; PRINT(LD_IO, "call omp_get_cancellation() returns %d\n", rc); return rc; } diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/loop.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/loop.cu --- a/openmp/libomptarget/deviceRTLs/nvptx/src/loop.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/loop.cu @@ -170,7 +170,7 @@ break; } default: { - ASSERT(LT_FUSSY, FALSE, "unknown schedtype %d", (int)schedtype); + ASSERT(LT_FUSSY, 0, "unknown schedtype %d", (int)schedtype); PRINT(LD_LOOP, "unknown schedtype %d, revert back to static chunk\n", (int)schedtype); ForStaticChunk(lastiter, lb, ub, stride, chunk, gtid, diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/option.h b/openmp/libomptarget/deviceRTLs/nvptx/src/option.h --- a/openmp/libomptarget/deviceRTLs/nvptx/src/option.h +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/option.h @@ -58,11 +58,5 @@ #define INLINE __forceinline__ __device__ #define NOINLINE __noinline__ __device__ -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif #endif diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/parallel.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/parallel.cu --- a/openmp/libomptarget/deviceRTLs/nvptx/src/parallel.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/parallel.cu @@ -460,7 +460,7 @@ EXTERN void __kmpc_push_num_teams(kmp_Ident *loc, int32_t tid, int32_t num_teams, int32_t thread_limit) { PRINT(LD_IO, "call kmpc_push_num_teams %d\n", (int)num_teams); - ASSERT0(LT_FUSSY, FALSE, + ASSERT0(LT_FUSSY, 0, "should never have anything with new teams on device"); }