1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicting commit.

Browse Source
This commit is contained in:
Michael Meskes 2008-02-15 16:28:47 +00:00
parent bea0466d9d
commit 0a96951017
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/interfaces/ecpg/preproc/pgc.l
View File

@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.159.2.1 2008/02/15 12:11:02 meskes Exp $ * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.159.2.2 2008/02/15 16:28:47 meskes Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -743,11 +743,7 @@ cppline {space}*#(.*\\{space})*.*{newline}
<C>{identifier} { <C>{identifier} {
const ScanKeyword *keyword; const ScanKeyword *keyword;
<<<<<<< pgc.l
if (!INFORMIX_MODE && !isdefine())
=======
if (!isdefine()) if (!isdefine())
>>>>>>> 1.162
{ {
keyword = ScanCKeywordLookup(yytext); keyword = ScanCKeywordLookup(yytext);
if (keyword != NULL) if (keyword != NULL)