From 2213d5038c99113e93f817626ee14daa8f95f6f4 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Mon, 30 Jan 2017 13:33:23 +0100 Subject: [PATCH] plugins: Prevent redefinition of "NOMINMAX" Define "NOMINMAX" only if it isn't already. MinGW defines it by default, which results in the following warning: warning: "NOMINMAX" redefined --- plugins/mumble_plugin_win32_ptr_type.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/mumble_plugin_win32_ptr_type.h b/plugins/mumble_plugin_win32_ptr_type.h index 4a1384b0d..d5c71caa5 100644 --- a/plugins/mumble_plugin_win32_ptr_type.h +++ b/plugins/mumble_plugin_win32_ptr_type.h @@ -13,7 +13,11 @@ #define _USE_MATH_DEFINES #include #include -#define NOMINMAX +// Define "NOMINMAX" only if it isn't already. +// MinGW defines it by default, which results in a redefinition warning. +#ifndef NOMINMAX +# define NOMINMAX +#endif #include #include #include