From 37d631212417d0e40f71fcad2c2a1df907165aa0 Mon Sep 17 00:00:00 2001 From: tma Date: Sat, 5 Jul 2008 23:50:38 +0000 Subject: * (bug 3610) Server sending unnecessary newline with SV_ConSay_F (Tyler Schwend ) * (bug 3623) COMMAND is mapped to the ALT key (Matthias ) * (bug 3665) Typo error in FS_FOpenFileByMode function (TsT ) * (bug 3669) Some files left out of Solaris Packages (Vincent Cojot ) * (bug 3680) server quit messages (Ben Millwood) * (bug 3682) Maps with >1024 models cause a segfault (misantropia ) * (bug 3683) R_FindShader(): negative lightmap indexes cause stray pointers (misantropia ) * (bug 3688) q3asm potential segfault fix and other changes (TsT ) * (bug 3695) Not allowing to write file with lib extention (.dll/.so/...) (TsT ) * (bug 3696) make-macosx-ub.sh outdated by revision 1340; test for Tiger not working (Matthias ) * (bug 3698) #error reported as warning in q3cpp (and no #warning support) (Ben Millwood) * (bug 3703) restoring the valued pre-SDL window behaviour (/dev/humancontroller ) git-svn-id: svn://svn.icculus.org/quake3/trunk@1405 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/tools/lcc/cpp/cpp.c | 7 ++++++- code/tools/lcc/cpp/cpp.h | 2 +- code/tools/lcc/cpp/nlist.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'code/tools/lcc/cpp') diff --git a/code/tools/lcc/cpp/cpp.c b/code/tools/lcc/cpp/cpp.c index 6739e4d..1fcffbc 100644 --- a/code/tools/lcc/cpp/cpp.c +++ b/code/tools/lcc/cpp/cpp.c @@ -204,9 +204,14 @@ control(Tokenrow *trp) error(WARNING, "Syntax error in #endif"); break; + case KWARNING: + trp->tp = tp+1; + error(WARNING, "#warning directive: %r", trp); + break; + case KERROR: trp->tp = tp+1; - error(WARNING, "#error directive: %r", trp); + error(ERROR, "#error directive: %r", trp); break; case KLINE: diff --git a/code/tools/lcc/cpp/cpp.h b/code/tools/lcc/cpp/cpp.h index ae855c9..87871d9 100644 --- a/code/tools/lcc/cpp/cpp.h +++ b/code/tools/lcc/cpp/cpp.h @@ -24,7 +24,7 @@ enum toktype { END, UNCLASS, NAME, NUMBER, STRING, CCON, NL, WS, DSHARP, DSHARP1, NAME1, DEFINED, UMINUS }; enum kwtype { KIF, KIFDEF, KIFNDEF, KELIF, KELSE, KENDIF, KINCLUDE, KDEFINE, - KUNDEF, KLINE, KERROR, KPRAGMA, KDEFINED, + KUNDEF, KLINE, KWARNING, KERROR, KPRAGMA, KDEFINED, KLINENO, KFILE, KDATE, KTIME, KSTDC, KEVAL }; #define ISDEFINED 01 /* has #defined value */ diff --git a/code/tools/lcc/cpp/nlist.c b/code/tools/lcc/cpp/nlist.c index d76df86..d3a8357 100644 --- a/code/tools/lcc/cpp/nlist.c +++ b/code/tools/lcc/cpp/nlist.c @@ -29,6 +29,7 @@ struct kwtab { {"define", KDEFINE, ISKW}, {"undef", KUNDEF, ISKW}, {"line", KLINE, ISKW}, + {"warning", KWARNING, ISKW}, {"error", KERROR, ISKW}, {"pragma", KPRAGMA, ISKW}, {"eval", KEVAL, ISKW}, -- cgit v1.2.3