]> git.pld-linux.org Git - packages/opencv.git/commitdiff
- un-debianize no-sysctl patch
authorJan Rękorajski <baggins@pld-linux.org>
Mon, 9 Mar 2015 12:41:08 +0000 (13:41 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Mon, 9 Mar 2015 12:41:08 +0000 (13:41 +0100)
no-sysctl.patch

index dd37a322f1b00c8e1865ebf94eb69dfd1d44b8d9..8488f7986fd422c938004faa2812a9a2b4871230 100644 (file)
@@ -9,24 +9,22 @@ Author: Adam Borowski <kilobyte@angband.pl>
 
 --- opencv-2.4.9.1+dfsg.orig/modules/core/src/parallel.cpp
 +++ opencv-2.4.9.1+dfsg/modules/core/src/parallel.cpp
-@@ -56,8 +56,8 @@
+@@ -56,7 +56,7 @@
      #include <sys/types.h>
      #if defined ANDROID
          #include <sys/sysconf.h>
--    #elif !defined __GNU__
--        #include <sys/sysctl.h>
-+     #elif defined __APPLE__
-+         #include <sys/sysctl.h>
+-    #else
++    #elif defined __APPLE__
+         #include <sys/sysctl.h>
      #endif
  #endif
 --- opencv-2.4.9.1+dfsg.orig/modules/core/src/system.cpp
 +++ opencv-2.4.9.1+dfsg/modules/core/src/system.cpp
 @@ -163,8 +163,6 @@ std::wstring GetTempFileNameWinRT(std::w
  #include <sys/types.h>
  #if defined ANDROID
  #include <sys/sysconf.h>
--#elif !defined __GNU__
+-#else
 -#include <sys/sysctl.h>
  #endif
  #endif
This page took 0.041523 seconds and 4 git commands to generate.