]> git.ipfire.org Git - thirdparty/postgresql.git/commit
Dodge a macro-name conflict with Perl.
authorTom Lane <tgl@sss.pgh.pa.us>
Thu, 19 Nov 2015 19:54:05 +0000 (14:54 -0500)
committerTom Lane <tgl@sss.pgh.pa.us>
Thu, 19 Nov 2015 19:54:11 +0000 (14:54 -0500)
commit68c1d7d42e553682f1d2723e623b6a3a4b02c75f
tree56a4727e5d7370af97c94b9e360cd80f73c0320c
parentdb135e834a28180e9151f12c694b07d8fc3c41a8
Dodge a macro-name conflict with Perl.

Some versions of Perl export a macro named HS_KEY.  This creates a
conflict in contrib/hstore_plperl against hstore's macro of the same
name.  The most future-proof solution seems to be to rename our macro;
I chose HSTORE_KEY.  For consistency, rename HS_VAL and related macros
similarly.

Back-patch to 9.5.  contrib/hstore_plperl doesn't exist before that
so there is no need to worry about the conflict in older releases.

Per reports from Marco Atzeri and Mike Blackwell.
contrib/hstore/hstore.h
contrib/hstore/hstore_compat.c
contrib/hstore/hstore_gin.c
contrib/hstore/hstore_gist.c
contrib/hstore/hstore_io.c
contrib/hstore/hstore_op.c
contrib/hstore_plperl/hstore_plperl.c
contrib/hstore_plpython/hstore_plpython.c