diff options
| author | Michael Meskes <meskes@postgresql.org> | 2008-02-15 16:28:47 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2008-02-15 16:28:47 +0000 |
| commit | 0a96951017afd5159d26e4e34d113e60b51b6675 (patch) | |
| tree | ccfd7b43c55d5496126a90fb2c7c3c091d01a5ff /src | |
| parent | bea0466d9dc099f1fda28f5714e83ad9a1b23034 (diff) | |
| download | postgresql-0a96951017afd5159d26e4e34d113e60b51b6675.tar.gz postgresql-0a96951017afd5159d26e4e34d113e60b51b6675.zip | |
Fixed conflicting commit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/preproc/pgc.l | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index ee2805d157f..02ba8240b69 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -12,7 +12,7 @@ * * * 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} { const ScanKeyword *keyword; -<<<<<<< pgc.l - if (!INFORMIX_MODE && !isdefine()) -======= if (!isdefine()) ->>>>>>> 1.162 { keyword = ScanCKeywordLookup(yytext); if (keyword != NULL) |