Merge pull request #2145 from andreasBihlmaier:2.4

This commit is contained in:
Roman Donchenko 2014-01-14 11:55:28 +04:00 committed by OpenCV Buildbot
commit 2fde4d8a94
6 changed files with 6 additions and 6 deletions

View File

@ -210,7 +210,7 @@
#include <string>
#endif
#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
#if defined(__linux__) || defined(__APPLE__) || defined(__MACOSX)
#include <alloca.h>
#include <emmintrin.h>

View File

@ -45,7 +45,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32
#if defined(linux)
#if defined(__linux__)
#include <dlfcn.h>
#include <stdio.h>

View File

@ -27,7 +27,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32
#if defined(linux)
#if defined(__linux__)
#include <dlfcn.h>
#include <stdio.h>

View File

@ -27,7 +27,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32
#if defined(linux)
#if defined(__linux__)
#include <dlfcn.h>
#include <stdio.h>

View File

@ -24,7 +24,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32
#if defined(linux)
#if defined(__linux__)
#include <dlfcn.h>
#include <stdio.h>

View File

@ -24,7 +24,7 @@
#define CV_CL_GET_PROC_ADDRESS(name) WinGetProcAddress(name)
#endif // _WIN32
#if defined(linux)
#if defined(__linux__)
#include <dlfcn.h>
#include <stdio.h>