iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compilation on linux 

Closes tgoyne/aegisub#4.
This commit is contained in:
Thomas Goyne 2014-04-03 17:24:27 -07:00
parent b8d67b3d8e
commit 54fa37c855
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libaegisub/include/libaegisub/option_value.h
View File

@ -23,6 +23,9 @@
#include <libaegisub/exception.h> #include <libaegisub/exception.h>
#include <libaegisub/signal.h> #include <libaegisub/signal.h>
// X11 is awesome and defines Bool to int
#undef Bool
namespace agi { namespace agi {
DEFINE_BASE_EXCEPTION_NOINNER(OptionValueError, Exception) DEFINE_BASE_EXCEPTION_NOINNER(OptionValueError, Exception)
DEFINE_SIMPLE_EXCEPTION_NOINNER(OptionValueErrorInvalidType, OptionValueError, "options/invalid_type") DEFINE_SIMPLE_EXCEPTION_NOINNER(OptionValueErrorInvalidType, OptionValueError, "options/invalid_type")

2
src/preferences_base.cpp
View File

@ -42,6 +42,8 @@
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/treebook.h> #include <wx/treebook.h>
#undef Bool
#define OPTION_UPDATER(type, evttype, opt, body) \ #define OPTION_UPDATER(type, evttype, opt, body) \
class type { \ class type { \
std::string name; \ std::string name; \