From 47beda4c89d6a177d7a2affe32f1ef0b084af5b8 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 30 Apr 2010 16:15:12 +0000 Subject: [PATCH] Fix build error introduced in r4250 when not using precompiled headers. Originally committed to SVN as r4251. --- aegisub/src/gl_text.cpp | 2 ++ aegisub/src/video_out_gl.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/aegisub/src/gl_text.cpp b/aegisub/src/gl_text.cpp index 55b875324..c5c89c93c 100644 --- a/aegisub/src/gl_text.cpp +++ b/aegisub/src/gl_text.cpp @@ -42,6 +42,7 @@ #ifndef AGI_PRE #include #include +#include #endif #include "gl_text.h" @@ -283,6 +284,7 @@ OpenGLTextGlyph OpenGLText::CreateGlyph(int n) { /// @param h /// OpenGLTextTexture::OpenGLTextTexture(int w,int h) { + using std::max; // Properties x = y = nextY = 0; width = max(SmallestPowerOf2(w), 64); diff --git a/aegisub/src/video_out_gl.cpp b/aegisub/src/video_out_gl.cpp index dfbe73810..6933e322e 100644 --- a/aegisub/src/video_out_gl.cpp +++ b/aegisub/src/video_out_gl.cpp @@ -39,6 +39,7 @@ #ifndef AGI_PRE #include #include +#include #endif using std::min;