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

gcc 4.5 compilation fixes

Browse source 
Originally committed to SVN as r4797.
This commit is contained in:
Thomas Goyne 2010-10-11 04:25:02 +00:00
parent 1fbe7b4f1e
commit b4739d2aee
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/libaegisub/include/libaegisub/log.h
View file

@ -39,7 +39,7 @@
// These macros below aren't a perm solution, it will depend on how annoying they are through // These macros below aren't a perm solution, it will depend on how annoying they are through
// actual usage, and also depends on msvc support. // actual usage, and also depends on msvc support.
#define LOG_SINK(section, severity) agi::log::Message::Message(section, severity, __FILE__, __FUNCTION__, __LINE__).stream() #define LOG_SINK(section, severity) agi::log::Message(section, severity, __FILE__, __FUNCTION__, __LINE__).stream()
#define LOG_E(section) LOG_SINK(section, agi::log::Exception) #define LOG_E(section) LOG_SINK(section, agi::log::Exception)
#define LOG_A(section) LOG_SINK(section, agi::log::Assert) #define LOG_A(section) LOG_SINK(section, agi::log::Assert)
#define LOG_W(section) LOG_SINK(section, agi::log::Warning) #define LOG_W(section) LOG_SINK(section, agi::log::Warning)

2
aegisub/src/gl_wrap.h
View file

@ -65,7 +65,7 @@ typedef GLuint GLhandleARB;
#define GL_EXT(type, name) \ #define GL_EXT(type, name) \
static type name = reinterpret_cast<type>(glGetProc(#name)); \ static type name = reinterpret_cast<type>(glGetProc(#name)); \
if (!name) { \ if (!name) { \
name = & name ## Fallback; \ name = reinterpret_cast<type>(& name ## Fallback); \
} }
#endif #endif

2
aegisub/src/visual_tool_vector_clip.cpp
View file

@ -119,7 +119,7 @@ void VisualToolVectorClip::SetMode(int newMode) {
// Substitute for glMultiDrawArrays for sub-1.4 OpenGL // Substitute for glMultiDrawArrays for sub-1.4 OpenGL
// Not required on OS X. // Not required on OS X.
#ifndef __APPLE__ #ifndef __APPLE__
static void APIENTRY glMultiDrawArraysFallback(GLenum mode, GLint *first, GLsizei *count, GLsizei primcount) { static void APIENTRY glMultiDrawArraysFallback(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount) {
for (int i = 0; i < primcount; ++i) { for (int i = 0; i < primcount; ++i) {
glDrawArrays(mode, *first++, *count++); glDrawArrays(mode, *first++, *count++);
} }