Get rid of sysctl includes on Linux.

The 'sysctl' syscall has been strongly deprecated on Linux for ages.
Currently, on old architectures it will spam syslog whenever used, and on
newer ones it's missing from the headers altogether.  Opencv has migrated
away on Linux already, but #includes were left lingering.  This commit
removes them on non-__APPLE__, unbreaking x32 (and probably others).
pull/3593/head
Adam Borowski 10 years ago
parent 390f17d1e0
commit 7b0d1c932e
  1. 2
      modules/core/src/parallel.cpp
  2. 2
      modules/core/src/system.cpp
  3. 2
      modules/videoio/src/cap_ffmpeg_impl.hpp

@ -56,7 +56,7 @@
#include <sys/types.h>
#if defined ANDROID
#include <sys/sysconf.h>
#else
#elif defined __APPLE__
#include <sys/sysctl.h>
#endif
#endif

@ -163,8 +163,6 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#include <sys/types.h>
#if defined ANDROID
#include <sys/sysconf.h>
#else
#include <sys/sysctl.h>
#endif
#endif

@ -139,8 +139,10 @@ extern "C" {
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
#if defined __APPLE__
#include <sys/sysctl.h>
#endif
#endif
#ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b))

Loading…
Cancel
Save