mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Make sure Windows builds don't get min and max macros defined from WinDef.h.

Browse source 
Originally committed to SVN as r4957.
This commit is contained in:
Niels Martin Hansen 2010-12-11 18:27:28 +00:00
parent d188673e7c
commit ba6fded1cd
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/src/agi_pre.h
View file

@ -115,7 +115,6 @@
#include <windows.h> #include <windows.h>
#include <objbase.h> #include <objbase.h>
#include <mmsystem.h> #include <mmsystem.h>
//#include <process.h> // Currently only used in audio_player_dsound2.cpp
#else #else

6
aegisub/src/config.h
View file

@ -2,6 +2,12 @@
#ifdef _WIN32 #ifdef _WIN32
// Define min and max macros to identity.
// This will prevent WinDef.h defining them to functions, which prevents
// using std::min and std::max.
#define min min
#define max max
// Windows specific settings // Windows specific settings
#include "config/config_windows.h" #include "config/config_windows.h"