X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=no-sysctl.patch;h=8488f7986fd422c938004faa2812a9a2b4871230;hb=1677dab96462144cd2dcbd8a9da7416127d6870a;hp=dd37a322f1b00c8e1865ebf94eb69dfd1d44b8d9;hpb=f9e8f4ea153f7b5b3bee1dc0ec0d2eb6e75e0ad9;p=packages%2Fopencv.git

diff --git a/no-sysctl.patch b/no-sysctl.patch
index dd37a32..8488f79 100644
--- a/no-sysctl.patch
+++ b/no-sysctl.patch
@@ -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