summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/lang-fake.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2012-05-30 16:10:06 +0200
committerAdam Borowski <kilobyte@angband.pl>2012-08-28 00:17:44 +0200
commit33e7c498ba8227245115231373b9a25430ca5eb2 (patch)
treecaa36c0ef1ba76bbf6d2a3350b63b24242a61c5b /crawl-ref/source/lang-fake.cc
parentcdeb0bb5e5473b9a929d612e1cffabb4f533646f (diff)
downloadcrawl-ref-33e7c498ba8227245115231373b9a25430ca5eb2.tar.gz
crawl-ref-33e7c498ba8227245115231373b9a25430ca5eb2.zip
Allow "%"PRI to build in C++11 mode.
This is a misdesign in the standard, the committee is debating whether it's a defect or not, we'll know the result in ten years or so. In the meantime, gcc-4.8 and clang(version?) added a fix so formerly legal code compiles (but with a warning...). This fix is not yet in gcc-4.7 nor clang-3.1, and since failing to build on compilers that happen in the wild is a bad idea, let's kludge it around with spaces. More info: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52538
Diffstat (limited to 'crawl-ref/source/lang-fake.cc')
-rw-r--r--crawl-ref/source/lang-fake.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/lang-fake.cc b/crawl-ref/source/lang-fake.cc
index f2112fc741..e75ba05f50 100644
--- a/crawl-ref/source/lang-fake.cc
+++ b/crawl-ref/source/lang-fake.cc
@@ -113,7 +113,7 @@ static const char* jager[][4] =
{"^c","k", 0, "h"},
{"am$","em"},
{"^th","t"},
- {"th","dd", "!"LETTERS, "!"LETTERS},
+ {"th","dd", "!" LETTERS, "!" LETTERS},
{"unix","yoonix"},
{"^un","on"},
{"^sh","sch", 0, "e"},
@@ -127,8 +127,8 @@ static const char* jager[][4] =
{"ing","ink"},
{"irl","url"},
{"ish","eesh"},
- {"^i","hy", 0, ")"LETTERS},
- {"ve$","ff", "!"LETTERS},
+ {"^i","hy", 0, ")" LETTERS},
+ {"ve$","ff", "!" LETTERS},
{"ect$","eck"},
{"and","und"},
{"^all","hall"},