[opencv] 06/17: Update patches/fix_ftbfs_on_non_linux

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to branch master
in repository opencv.

commit d6feb184815b8b1a9a02441319249da1cd335890
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Mon Aug 28 08:54:57 2017 +0900

    Update patches/fix_ftbfs_on_non_linux
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
---
 debian/patches/fix_ftbfs_on_non_linux | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/fix_ftbfs_on_non_linux b/debian/patches/fix_ftbfs_on_non_linux
index 8cb1814..d3b2a14 100644
--- a/debian/patches/fix_ftbfs_on_non_linux
+++ b/debian/patches/fix_ftbfs_on_non_linux
@@ -1,30 +1,30 @@
 Description: Fix FTBFS on non linux
 Forwarded: not yet
 Author: Pino Toscano <pino at debian.org>
-Last-Update: 2017-05-09
+Last-Update: 2017-08-27
 
 diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp
-index 71ac94eec8..c36911377d 100644
+index 53ebb4212e..0edef5b30e 100644
 --- a/modules/core/src/parallel.cpp
 +++ b/modules/core/src/parallel.cpp
-@@ -50,13 +50,13 @@
+@@ -52,13 +52,13 @@
      #undef abs
  #endif
  
 -#if defined __linux__ || defined __APPLE__
-+#if defined __linux__ || defined __APPLE__ || defined __GLIBC__
++#if defined __linux__ || defined __APPLE__ ||  defined __GLIBC__
      #include <unistd.h>
      #include <stdio.h>
      #include <sys/types.h>
-     #if defined ANDROID
+     #if defined __ANDROID__
          #include <sys/sysconf.h>
 -    #elif defined __APPLE__
 +    #elif defined __APPLE__ || !defined __GNU__
          #include <sys/sysctl.h>
      #endif
  #endif
-@@ -562,7 +562,7 @@ int cv::getNumberOfCPUs(void)
- #elif defined ANDROID
+@@ -644,7 +644,7 @@ int cv::getNumberOfCPUs(void)
+ #elif defined __ANDROID__
      static int ncpus = getNumberOfCPUsImpl();
      return ncpus;
 -#elif defined __linux__
@@ -33,19 +33,19 @@ index 71ac94eec8..c36911377d 100644
  #elif defined __APPLE__
      int numCPU=0;
 diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
-index 3c8f39d74b..6264dd6da6 100644
+index 3eeb5fe9ba..3d628cda3b 100644
 --- a/modules/core/src/system.cpp
 +++ b/modules/core/src/system.cpp
-@@ -198,12 +198,14 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
- 
- #include <stdarg.h>
+@@ -202,12 +202,14 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
+ #include "omp.h"
+ #endif
  
 -#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__
 +#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __GLIBC__
  #include <unistd.h>
  #include <stdio.h>
  #include <sys/types.h>
- #if defined ANDROID
+ #if defined __ANDROID__
  #include <sys/sysconf.h>
 +#elif !defined __GNU__
 +#include <sys/sysctl.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git