port of MR #4061 to master

b0cbec92 · Ilya Lavrenov · 8fb37606 · b0cbec92
显示空白变更内容
内联并排

Showing with 11 addition and 5 deletion

modules/ts/src/cuda_perf.cpp modules/ts/src/cuda_perf.cpp +11 -5

未找到文件。
--- a/modules/ts/src/cuda_perf.cpp
+++ b/modules/ts/src/cuda_perf.cpp
@@ -237,18 +237,24 @@ namespace perf
    #   else
            printf("[----------]\n[ GPU INFO ] \tRun on OS Windows x32.\n[----------]\n"), fflush(stdout);
    #   endif
-    #elif defined linux
-    #   if defined _LP64
-            printf("[----------]\n[ GPU INFO ] \tRun on OS Linux x64.\n[----------]\n"), fflush(stdout);
+    #elif defined ANDROID
+    #   if defined _LP64 || defined __LP64__
+            printf("[----------]\n[ GPU INFO ] \tRun on OS Android x64.\n[----------]\n"), fflush(stdout);
    #   else
-            printf("[----------]\n[ GPU INFO ] \tRun on OS Linux x32.\n[----------]\n"), fflush(stdout);
+            printf("[----------]\n[ GPU INFO ] \tRun on OS Android x32.\n[----------]\n"), fflush(stdout);
    #   endif
    #elif defined __APPLE__
-    #   if defined _LP64
+    #   if defined _LP64 || defined __LP64__
            printf("[----------]\n[ GPU INFO ] \tRun on OS Apple x64.\n[----------]\n"), fflush(stdout);
    #   else
            printf("[----------]\n[ GPU INFO ] \tRun on OS Apple x32.\n[----------]\n"), fflush(stdout);
    #   endif
+    #elif defined linux
+    #   if defined _LP64 || defined __LP64__
+            printf("[----------]\n[ GPU INFO ] \tRun on OS Linux x64.\n[----------]\n"), fflush(stdout);
+    #   else
+            printf("[----------]\n[ GPU INFO ] \tRun on OS Linux x32.\n[----------]\n"), fflush(stdout);
+    #   endif
    #endif

    }