mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 08:13:04 +04:00
build: replace WIN32 => _WIN32
This commit is contained in:
@@ -60,7 +60,7 @@
|
||||
#include <ctype.h>
|
||||
#include <assert.h>
|
||||
|
||||
#if defined WIN32 || defined WINCE
|
||||
#if defined _WIN32 || defined WINCE
|
||||
#include <windows.h>
|
||||
#undef small
|
||||
#undef min
|
||||
|
||||
@@ -351,7 +351,7 @@ CV_IMPL int cvWaitKey(int delay)
|
||||
|
||||
//to decrease CPU usage
|
||||
//sleep 1 millisecond
|
||||
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
|
||||
#if defined _WIN32
|
||||
Sleep(1);
|
||||
#else
|
||||
usleep(1000);
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "precomp.hpp"
|
||||
#include "opencv2/imgproc.hpp"
|
||||
|
||||
#ifndef WIN32
|
||||
#ifndef _WIN32
|
||||
|
||||
#if defined (HAVE_GTK)
|
||||
|
||||
@@ -2097,6 +2097,6 @@ CV_IMPL int cvWaitKey( int delay )
|
||||
|
||||
|
||||
#endif // HAVE_GTK
|
||||
#endif // WIN32
|
||||
#endif // _WIN32
|
||||
|
||||
/* End of file. */
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "precomp.hpp"
|
||||
#include <windowsx.h> // required for GET_X_LPARAM() and GET_Y_LPARAM() macros
|
||||
|
||||
#if defined WIN32 || defined _WIN32
|
||||
#if defined _WIN32
|
||||
|
||||
#ifdef __GNUC__
|
||||
# pragma GCC diagnostic ignored "-Wmissing-declarations"
|
||||
@@ -2426,4 +2426,4 @@ cvSetPostprocessFuncWin32_(const void* callback)
|
||||
hg_on_postprocess = (CvWin32WindowCallback)callback;
|
||||
}
|
||||
|
||||
#endif //WIN32
|
||||
#endif //_WIN32
|
||||
|
||||
Reference in New Issue
Block a user