mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include: Respect NOMINMAX.

This commit is contained in:
Henri Verbeet 2017-07-18 18:56:49 +02:00
parent e307beee29
commit e9fe4da01e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/vkd3d_windows.h
View File

@ -201,13 +201,15 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES;
#endif /* DECLSPEC_HIDDEN */
/* Define min() & max() macros */
#ifndef min
# define min(a, b) (((a) <= (b)) ? (a) : (b))
#endif
#ifndef NOMINMAX
# ifndef min
# define min(a, b) (((a) <= (b)) ? (a) : (b))
# endif
#ifndef max
# define max(a, b) (((a) >= (b)) ? (a) : (b))
#endif
# ifndef max
# define max(a, b) (((a) >= (b)) ? (a) : (b))
# endif
#endif /* NOMINMAX */
#ifndef DEFINE_ENUM_FLAG_OPERATORS
#ifdef __cplusplus