Merge pull request #5720 from asmorkalov:as/cuda_qnx

681df840 · Maksim Shabunin · 4d598719 · 53ed1a8c · 681df840
Commit 681df840 authored Dec 03, 2015 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.hpp modules/gpu/include/opencv2/gpu/device/common.hpp +1 -1

No files found.
--- 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