pgsql: Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

Started by Tom Lanealmost 14 years ago5 messages
#1Tom Lane
tgl@sss.pgh.pa.us

Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

Per buildfarm, this is now needed by contrib/pg_stat_statements.

Branch
------
master

Details
-------
http://git.postgresql.org/pg/commitdiff/5e83854d71bb05403768a97a415a129b0081564b

Modified Files
--------------
src/include/parser/keywords.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

#2Andrew Dunstan
andrew@dunslane.net
In reply to: Tom Lane (#1)
Re: pgsql: Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

On 03/31/2012 10:56 AM, Tom Lane wrote:

Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

Per buildfarm, this is now needed by contrib/pg_stat_statements.

It seems to have broken mingw earlier now :-(

cheers

andrew

#3Tom Lane
tgl@sss.pgh.pa.us
In reply to: Andrew Dunstan (#2)
Re: [COMMITTERS] pgsql: Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

Andrew Dunstan <andrew@dunslane.net> writes:

On 03/31/2012 10:56 AM, Tom Lane wrote:

Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

Per buildfarm, this is now needed by contrib/pg_stat_statements.

It seems to have broken mingw earlier now :-(

Ugh. It looks like ecpg (and also pg_dump) are defining symbols named
ScanKeywords and NumScanKeywords, but relying on the backend's
keywords.h to provide global declarations for those. And this doesn't
work once we PGDLLIMPORT-decorate those declarations.

The only simple fix I can see is to rename the symbols in ecpg and
pg_dump to something else. This is probably a good thing anyway to
reduce confusion. Anybody have another idea?

regards, tom lane

#4Andrew Dunstan
andrew@dunslane.net
In reply to: Tom Lane (#3)
Re: [COMMITTERS] pgsql: Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

On 03/31/2012 11:59 AM, Tom Lane wrote:

Andrew Dunstan<andrew@dunslane.net> writes:

On 03/31/2012 10:56 AM, Tom Lane wrote:

Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

Per buildfarm, this is now needed by contrib/pg_stat_statements.

It seems to have broken mingw earlier now :-(

Ugh. It looks like ecpg (and also pg_dump) are defining symbols named
ScanKeywords and NumScanKeywords, but relying on the backend's
keywords.h to provide global declarations for those. And this doesn't
work once we PGDLLIMPORT-decorate those declarations.

The only simple fix I can see is to rename the symbols in ecpg and
pg_dump to something else. This is probably a good thing anyway to
reduce confusion. Anybody have another idea?

Seems the sane thing to do.

cheers

andrew

#5Tom Lane
tgl@sss.pgh.pa.us
In reply to: Andrew Dunstan (#4)
Re: [COMMITTERS] pgsql: Add PGDLLIMPORT to ScanKeywords and NumScanKeywords.

Andrew Dunstan <andrew@dunslane.net> writes:

On 03/31/2012 11:59 AM, Tom Lane wrote:

The only simple fix I can see is to rename the symbols in ecpg and
pg_dump to something else. This is probably a good thing anyway to
reduce confusion. Anybody have another idea?

Seems the sane thing to do.

Done, we'll see how the buildfarm likes this version ...

regards, tom lane