On 18-12-2014 18:51, Alexpux wrote: > >> 18 дек. 2014 г., в 15:49, Alex Peshkoff <[email protected] >> <mailto:[email protected]>> написал(а): >> >> On 12/18/14 15:31, Adriano dos Santos Fernandes wrote: >>> On 18/12/2014 10:10, Alexey Pavlov wrote: >>>> From 54e4756f1bd8dce672b10e24bac8419ec8faace7 Mon Sep 17 00:00:00 2001 >>>> From: Alexpux <[email protected] <mailto:[email protected]>> >>>> Date: Thu, 20 Nov 2014 20:18:32 +0300 >>>> Subject: [PATCH] Fix conflict between mingw defines and keywords >>>> defines. >>>> >>>> --- >>>> src/dsql/Parser.h | 6 ++++++ >>>> 1 file changed, 6 insertions(+) >>>> >>>> diff --git a/src/dsql/Parser.h b/src/dsql/Parser.h >>>> index 7ac5780..d6b04b7 100644 >>>> --- a/src/dsql/Parser.h >>>> +++ b/src/dsql/Parser.h >>>> @@ -35,6 +35,12 @@ >>>> #include "../common/classes/Nullable.h" >>>> #include "../common/classes/stack.h" >>>> >>>> +// ntsecapi.h from mingw-w64 already define STRING >>>> +// gen/parse.h have it's own define for STRING >>>> +#ifdef STRING >>>> +#undef STRING >>>> +#endif >>>> + >>>> #include "gen/parse.h" >>>> >>>> namespace Jrd { >>> Then STRING of parse.y and its uses must be changed. >>> >>> We use KW_ prefix when token keywords conflicts. STRING is not an >>> keyword. >>> >>> Maybe TOK_ is better than KW_ there? >>> >> >> Certainly, some prefix should be used. >> >> > Like in attached patch? >
Yes! Adriano ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel
