mirror of
https://github.com/arsenetar/dupeguru.git
synced 2025-03-10 05:34:36 +00:00
ifdef'd min/max functions when compiled under VC. It seems that VC already defines them.
This commit is contained in:
parent
967aeecf5b
commit
962805936e
@ -6,6 +6,7 @@ syntax: glob
|
||||
*.mode1v3
|
||||
*.pbxuser
|
||||
*.tm_build_errors
|
||||
*.pyd
|
||||
conf.yaml
|
||||
build
|
||||
cocoa/*/Info.plist
|
||||
@ -14,6 +15,11 @@ cocoa/*/dg_cocoa.plugin
|
||||
qt/base/*_rc.py
|
||||
qt/base/*_ui.py
|
||||
qt/*/*_ui.py
|
||||
qt/*/build
|
||||
qt/*/dist
|
||||
qt/*/install
|
||||
qt/*/logdict*.log
|
||||
qt/*/warn*.txt
|
||||
help_se/dupeguru_help
|
||||
help_me/dupeguru_me_help
|
||||
help_pe/dupeguru_pe_help
|
@ -15,6 +15,8 @@ static PyObject *NoBlocksError;
|
||||
/* avgdiff/maxdiff has been called with 2 block lists of different size. */
|
||||
static PyObject *DifferentBlockCountError;
|
||||
|
||||
/* It seems like MS VC defines min/max already */
|
||||
#ifndef _MSC_VER
|
||||
static int
|
||||
max(int a, int b)
|
||||
{
|
||||
@ -26,6 +28,7 @@ min(int a, int b)
|
||||
{
|
||||
return b < a ? b : a;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Create a tuple out of an array of integers. */
|
||||
static PyObject*
|
||||
|
@ -10,6 +10,8 @@
|
||||
#define PY_SSIZE_T_CLEAN
|
||||
#include "Python.h"
|
||||
|
||||
/* It seems like MS VC defines min/max already */
|
||||
#ifndef _MSC_VER
|
||||
static int
|
||||
max(int a, int b)
|
||||
{
|
||||
@ -21,6 +23,7 @@ min(int a, int b)
|
||||
{
|
||||
return b < a ? b : a;
|
||||
}
|
||||
#endif
|
||||
|
||||
static PyObject*
|
||||
getblock(PyObject *image)
|
||||
|
Loading…
x
Reference in New Issue
Block a user