Merge pull request #5720 from asmorkalov:as/cuda_qnx

2015-12-03 07:41:22 +00:00 · 2015-12-03 07:41:22 +00:00 · 681df84036
commit 681df84036
parent 4d598719da 53ed1a8c03
1 changed files with 1 additions and 1 deletions
--- a/modules/gpu/include/opencv2/gpu/device/common.hpp
+++ b/modules/gpu/include/opencv2/gpu/device/common.hpp
@ -100,7 +100,7 @@ namespace cv { namespace gpu
        typedef unsigned char uchar;
        typedef unsigned short ushort;
        typedef signed char schar;
-        #if defined (_WIN32) || defined (__APPLE__)
+        #if defined (_WIN32) || defined (__APPLE__) || defined (__QNX__)
            typedef unsigned int uint;
        #endif