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

Sigh, -ansi isn't the solution since other compilers may define 'unix', for now the namespace has been called u_nix, hopefully this is safe but who knows... 

Originally committed to SVN as r4445.
This commit is contained in:
Amar Takhar 2010-06-06 02:32:50 +00:00
parent acc9e53714
commit 2aeb0bdffb
2 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/Makefile.am
View File

@ -4,7 +4,7 @@ AM_CXXFLAGS=
DISTCLEANFILES=
lib_LTLIBRARIES = libaegisub-2.2.la
libaegisub_2_2_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -ansi -pedantic
libaegisub_2_2_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -pedantic
libaegisub_2_2_la_LDFLAGS = @ICONV_LDFLAGS@
if PRECOMPILED_HEADER

4
aegisub/libaegisub/include/libaegisub/types.h
View File

@ -51,8 +51,8 @@ typedef struct tm {
namespace unix {
// u_nix beacuse some compilers set "unix" to 1 if it's unix. -> ARGH.
namespace u_nix {
} // namespace unix
namespace osx {