mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Remove #undef min/max as NOMINMAX is now defined by the project

Browse source 
Originally committed to SVN as r5879.
This commit is contained in:
Thomas Goyne 2011-11-18 22:56:58 +00:00
parent 8d28b44773
commit af9be4afa6
2 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
aegisub/src/audio_colorscheme.cpp
View file

@ -43,12 +43,6 @@
#include "audio_colorscheme.h" #include "audio_colorscheme.h"
#include "colorspace.h" #include "colorspace.h"
// Something is defining "min" and "max" macros, and they interfere with using std::min and std::max
#undef min
#undef max
void AudioColorScheme::InitIcyBlue_Normal() void AudioColorScheme::InitIcyBlue_Normal()
{ {
unsigned char *palptr = palette; unsigned char *palptr = palette;

5
aegisub/src/audio_renderer_waveform.cpp
View file

@ -49,11 +49,6 @@
#include "audio_renderer_waveform.h" #include "audio_renderer_waveform.h"
#include "colorspace.h" #include "colorspace.h"
#undef min
#undef max
AudioWaveformRenderer::AudioWaveformRenderer() AudioWaveformRenderer::AudioWaveformRenderer()
: AudioRendererBitmapProvider() : AudioRendererBitmapProvider()
, colors_normal(6) , colors_normal(6)