Implémentation du raytracing pour Global Memory/Shared Memory/Constant Memory

[GPU.git] / WCudaMSE / BilatTools_Cuda / src / core / cudatools / header / host / cudaTools.h

diff --git a/WCudaMSE/BilatTools_Cuda/src/core/cudatools/header/host/cudaTools.h b/WCudaMSE/BilatTools_Cuda/src/core/cudatools/header/host/cudaTools.h
index 8c0834d..5b48c74 100755 (executable)
--- a/WCudaMSE/BilatTools_Cuda/src/core/cudatools/header/host/cudaTools.h
+++ b/WCudaMSE/BilatTools_Cuda/src/core/cudatools/header/host/cudaTools.h
@@ -10,12 +10,11 @@
 // cublas\r
 #include "cublas_v2.h"         // Pour specifier la version qu'on veut! (definition CUBLASAPI)\r
 //#include "cublas.h"          // Pour specifier la version qu'on veut!(definition CUBLASAPI)\r
-#include "cublas_api.h" // Après include "cublas_v2.h" ou "cublas.h"\r
+#include "cublas_api.h" // Apr�s include "cublas_v2.h" ou "cublas.h"\r
 \r
-\r
-\r
-\r
-typedef unsigned char uchar;\r
+#ifndef uchar\r
+    typedef unsigned char uchar;\r
+#endif\r
 \r
 /*----------------------------------------------------------------------*\\r
  |*                    Declaration                                     *|\r