Merge PR #2790: mumble_plugin_win32_ptr_type.h: Prevent redefinition of "NOMINMAX"

This commit is contained in:
Mikkel Krautz 2017-02-02 01:20:54 +01:00 committed by GitHub
commit 1be562fefb

View File

@ -13,7 +13,11 @@
#define _USE_MATH_DEFINES
#include <stdio.h>
#include <stdlib.h>
#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 <windows.h>
#include <tlhelp32.h>
#include <math.h>