Use PG_MODULE_MAGIC_EXT in our installable shared libraries.

It seems potentially useful to label our shared libraries with version information, now that a facility exists for retrieving that. This patch labels them with the PG_VERSION string. There was some discussion about using semantic versioning conventions, but that doesn't seem terribly helpful for modules with no SQL-level presence; and for those that do have SQL objects, we typically expect them to support multiple revisions of the SQL definitions, so it'd still not be very helpful. I did not label any of src/test/modules/. It seems unnecessary since we don't install those, and besides there ought to be someplace that still provides test coverage for the original PG_MODULE_MAGIC macro. Author: Tom Lane <tgl@sss.pgh.pa.us> Discussion: https://postgr.es/m/dd4d1b59-d0fe-49d5-b28f-1e463b68fa32@gmail.com
1 year ago · 55527368bd
parent 9324c8c580
commit 55527368bd
89 changed files with 356 additions and 89 deletions
--- a/contrib/amcheck/verify_nbtree.c
+++ b/contrib/amcheck/verify_nbtree.c
@ -42,7 +42,10 @@
 #include "utils/snapmgr.h"


-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "amcheck",
+					.version = PG_VERSION
+);

 /*
 * A B-Tree cannot possibly have this many levels, since there must be one
--- a/contrib/auth_delay/auth_delay.c
+++ b/contrib/auth_delay/auth_delay.c
@ -16,7 +16,10 @@
 #include "libpq/auth.h"
 #include "utils/guc.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "auth_delay",
+					.version = PG_VERSION
+);

 /* GUC Variables */
 static int	auth_delay_milliseconds = 0;
--- a/contrib/basebackup_to_shell/basebackup_to_shell.c
+++ b/contrib/basebackup_to_shell/basebackup_to_shell.c
@ -18,7 +18,10 @@
 #include "utils/acl.h"
 #include "utils/guc.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "basebackup_to_shell",
+					.version = PG_VERSION
+);

 typedef struct bbsink_shell
 {
--- a/contrib/basic_archive/basic_archive.c
+++ b/contrib/basic_archive/basic_archive.c
@ -37,7 +37,10 @@
 #include "storage/fd.h"
 #include "utils/guc.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "basic_archive",
+					.version = PG_VERSION
+);

 static char *archive_directory = NULL;

--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@ -22,7 +22,10 @@
 #include "utils/memutils.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "bloom",
+					.version = PG_VERSION
+);

 /*
 * State of bloom index build.  We accumulate one page data here before
--- a/contrib/bool_plperl/bool_plperl.c
+++ b/contrib/bool_plperl/bool_plperl.c
@ -4,7 +4,10 @@
 #include "plperl.h"


-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "bool_plperl",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(bool_to_plperl);

--- a/contrib/btree_gin/btree_gin.c
+++ b/contrib/btree_gin/btree_gin.c
@ -14,7 +14,10 @@
 #include "utils/timestamp.h"
 #include "utils/uuid.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "btree_gin",
+					.version = PG_VERSION
+);

 typedef struct QueryInfo
 {
--- a/contrib/btree_gist/btree_gist.c
+++ b/contrib/btree_gist/btree_gist.c
@ -7,7 +7,10 @@
 #include "access/stratnum.h"
 #include "utils/builtins.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "btree_gist",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(gbt_decompress);
 PG_FUNCTION_INFO_V1(gbtreekey_in);
--- a/contrib/citext/citext.c
+++ b/contrib/citext/citext.c
@ -10,7 +10,10 @@
 #include "utils/varlena.h"
 #include "varatt.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "citext",
+					.version = PG_VERSION
+);

 /*
 *		====================
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@ -17,7 +17,10 @@
 #include "utils/array.h"
 #include "utils/float.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "cube",
+					.version = PG_VERSION
+);

 /*
 * Taken from the intarray contrib header
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@ -65,7 +65,10 @@
 #include "utils/varlena.h"
 #include "utils/wait_event.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "dblink",
+					.version = PG_VERSION
+);

 typedef struct remoteConn
 {
--- a/contrib/dict_int/dict_int.c
+++ b/contrib/dict_int/dict_int.c
@ -15,7 +15,10 @@
 #include "commands/defrem.h"
 #include "tsearch/ts_public.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "dict_int",
+					.version = PG_VERSION
+);

 typedef struct
 {
--- a/contrib/dict_xsyn/dict_xsyn.c
+++ b/contrib/dict_xsyn/dict_xsyn.c
@ -20,7 +20,10 @@
 #include "tsearch/ts_public.h"
 #include "utils/formatting.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "dict_xsyn",
+					.version = PG_VERSION
+);

 typedef struct
 {
--- a/contrib/earthdistance/earthdistance.c
+++ b/contrib/earthdistance/earthdistance.c
@ -11,7 +11,10 @@
 #define M_PI 3.14159265358979323846
 #endif

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "earthdistance",
+					.version = PG_VERSION
+);

 /* Earth's radius is in statute miles. */
 static const double EARTH_RADIUS = 3958.747716;
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@ -42,7 +42,10 @@
 #include "utils/sampling.h"
 #include "utils/varlena.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "file_fdw",
+					.version = PG_VERSION
+);

 /*
 * Describes the valid options for objects that use this wrapper.
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@ -44,7 +44,10 @@
 #include "utils/varlena.h"
 #include "varatt.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "fuzzystrmatch",
+					.version = PG_VERSION
+);

 /*
 * Soundex
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@ -21,7 +21,10 @@
 #include "utils/memutils.h"
 #include "utils/typcache.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "hstore",
+					.version = PG_VERSION
+);

 /* old names for C functions */
 HSTORE_POLLUTE(hstore_from_text, tconvert);
--- a/contrib/hstore_plperl/hstore_plperl.c
+++ b/contrib/hstore_plperl/hstore_plperl.c
@ -4,7 +4,10 @@
 #include "hstore/hstore.h"
 #include "plperl.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "hstore_plperl",
+					.version = PG_VERSION
+);

 /* Linkage to functions in hstore module */
 typedef HStore *(*hstoreUpgrade_t) (Datum orig);
--- a/contrib/hstore_plpython/hstore_plpython.c
+++ b/contrib/hstore_plpython/hstore_plpython.c
@ -5,7 +5,10 @@
 #include "plpy_typeio.h"
 #include "plpython.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "hstore_plpython",
+					.version = PG_VERSION
+);

 /* Linkage to functions in plpython module */
 typedef char *(*PLyObject_AsString_t) (PyObject *plrv);
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@ -5,7 +5,10 @@

 #include "_int.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "intarray",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(_int_different);
 PG_FUNCTION_INFO_V1(_int_same);
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@ -23,7 +23,10 @@
 #include "isn.h"
 #include "utils/guc.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "isn",
+					.version = PG_VERSION
+);

 #ifdef USE_ASSERT_CHECKING
 #define ISN_DEBUG 1
--- a/contrib/jsonb_plperl/jsonb_plperl.c
+++ b/contrib/jsonb_plperl/jsonb_plperl.c
@ -7,7 +7,10 @@
 #include "utils/fmgrprotos.h"
 #include "utils/jsonb.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "jsonb_plperl",
+					.version = PG_VERSION
+);

 static SV  *Jsonb_to_SV(JsonbContainer *jsonb);
 static JsonbValue *SV_to_JsonbValue(SV *obj, JsonbParseState **ps, bool is_elem);
--- a/contrib/jsonb_plpython/jsonb_plpython.c
+++ b/contrib/jsonb_plpython/jsonb_plpython.c
@ -7,7 +7,10 @@
 #include "utils/jsonb.h"
 #include "utils/numeric.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "jsonb_plpython",
+					.version = PG_VERSION
+);

 /* for PLyObject_AsString in plpy_typeio.c */
 typedef char *(*PLyObject_AsString_t) (PyObject *plrv);
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@ -12,7 +12,10 @@
 #include "utils/fmgrprotos.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "lo",
+					.version = PG_VERSION
+);


 /*
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@ -13,7 +13,10 @@
 #include "utils/selfuncs.h"
 #include "varatt.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "ltree",
+					.version = PG_VERSION
+);

 /* compare functions */
 PG_FUNCTION_INFO_V1(ltree_cmp);
--- a/contrib/ltree_plpython/ltree_plpython.c
+++ b/contrib/ltree_plpython/ltree_plpython.c
@ -4,7 +4,10 @@
 #include "ltree/ltree.h"
 #include "plpython.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "ltree_plpython",
+					.version = PG_VERSION
+);

 /* Linkage to functions in plpython module */
 typedef PyObject *(*PLyUnicode_FromStringAndSize_t) (const char *s, Py_ssize_t size);
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@ -29,7 +29,10 @@
 #include "utils/rel.h"
 #include "utils/varlena.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pageinspect",
+					.version = PG_VERSION
+);

 static bytea *get_raw_page_internal(text *relname, ForkNumber forknum,
 									BlockNumber blkno);
--- a/contrib/passwordcheck/passwordcheck.c
+++ b/contrib/passwordcheck/passwordcheck.c
@ -25,7 +25,10 @@
 #include "fmgr.h"
 #include "libpq/crypt.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "passwordcheck",
+					.version = PG_VERSION
+);

 /* Saved hook value */
 static check_password_hook_type prev_check_password_hook = NULL;
--- a/contrib/pg_buffercache/pg_buffercache_pages.c
+++ b/contrib/pg_buffercache/pg_buffercache_pages.c
@ -20,7 +20,10 @@
 #define NUM_BUFFERCACHE_SUMMARY_ELEM 5
 #define NUM_BUFFERCACHE_USAGE_COUNTS_ELEM 4

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_buffercache",
+					.version = PG_VERSION
+);

 /*
 * Record structure holding the to be exposed cache data.
--- a/contrib/pg_freespacemap/pg_freespacemap.c
+++ b/contrib/pg_freespacemap/pg_freespacemap.c
@ -12,7 +12,10 @@
 #include "fmgr.h"
 #include "storage/freespace.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_freespacemap",
+					.version = PG_VERSION
+);

 /*
 * Returns the amount of free space on a given page, according to the
--- a/contrib/pg_logicalinspect/pg_logicalinspect.c
+++ b/contrib/pg_logicalinspect/pg_logicalinspect.c
@ -18,7 +18,10 @@
 #include "utils/builtins.h"
 #include "utils/pg_lsn.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_logicalinspect",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(pg_get_logical_snapshot_meta);
 PG_FUNCTION_INFO_V1(pg_get_logical_snapshot_info);
--- a/contrib/pg_prewarm/pg_prewarm.c
+++ b/contrib/pg_prewarm/pg_prewarm.c
@ -26,7 +26,10 @@
 #include "utils/lsyscache.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_prewarm",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(pg_prewarm);

--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@ -71,7 +71,10 @@
 #include "utils/memutils.h"
 #include "utils/timestamp.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_stat_statements",
+					.version = PG_VERSION
+);

 /* Location of permanent stats file (valid when database is shut down) */
 #define PGSS_DUMP_FILE	PGSTAT_STAT_PERMANENT_DIRECTORY "/pg_stat_statements.stat"
--- a/contrib/pg_surgery/heap_surgery.c
+++ b/contrib/pg_surgery/heap_surgery.c
@ -23,7 +23,10 @@
 #include "utils/array.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_surgery",
+					.version = PG_VERSION
+);

 /* Options to forcefully change the state of a heap tuple. */
 typedef enum HeapTupleForceOption
--- a/contrib/pg_trgm/trgm_op.c
+++ b/contrib/pg_trgm/trgm_op.c
@ -18,7 +18,10 @@
 #include "utils/memutils.h"
 #include "utils/pg_crc.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_trgm",
+					.version = PG_VERSION
+);

 /* GUC variables */
 double		similarity_threshold = 0.3f;
--- a/contrib/pg_visibility/pg_visibility.c
+++ b/contrib/pg_visibility/pg_visibility.c
@ -25,7 +25,10 @@
 #include "storage/smgr.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_visibility",
+					.version = PG_VERSION
+);

 typedef struct vbits
 {
--- a/contrib/pg_walinspect/pg_walinspect.c
+++ b/contrib/pg_walinspect/pg_walinspect.c
@ -29,7 +29,10 @@
 * give a thought about doing the same in pg_waldump tool as well.
 */

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pg_walinspect",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(pg_get_wal_block_info);
 PG_FUNCTION_INFO_V1(pg_get_wal_record_info);
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@ -41,7 +41,10 @@
 #include "utils/guc.h"
 #include "varatt.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pgcrypto",
+					.version = PG_VERSION
+);

 /* private stuff */

--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@ -42,7 +42,10 @@
 #include "utils/snapmgr.h"
 #include "utils/varlena.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pgrowlocks",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(pgrowlocks);

--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@ -38,7 +38,10 @@
 #include "storage/lmgr.h"
 #include "utils/varlena.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pgstattuple",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(pgstattuple);
 PG_FUNCTION_INFO_V1(pgstattuple_v1_5);
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@ -49,7 +49,10 @@
 #include "utils/sampling.h"
 #include "utils/selfuncs.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "postgres_fdw",
+					.version = PG_VERSION
+);

 /* Default CPU cost to start up a foreign query. */
 #define DEFAULT_FDW_STARTUP_COST	100.0
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@ -28,7 +28,10 @@
 #define GIST_QUERY_DEBUG
 */

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "seg",
+					.version = PG_VERSION
+);

 /*
 * Auxiliary data structure for picksplit method.
--- a/contrib/sepgsql/hooks.c
+++ b/contrib/sepgsql/hooks.c
@ -25,7 +25,10 @@
 #include "utils/guc.h"
 #include "utils/queryenvironment.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "sepgsql",
+					.version = PG_VERSION
+);

 /*
 * Declarations
--- a/contrib/spi/autoinc.c
+++ b/contrib/spi/autoinc.c
@ -11,7 +11,10 @@
 #include "utils/builtins.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "autoinc",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(autoinc);

--- a/contrib/spi/insert_username.c
+++ b/contrib/spi/insert_username.c
@ -14,7 +14,10 @@
 #include "utils/builtins.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "insert_username",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(insert_username);

--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@ -22,7 +22,10 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
 #include "utils/fmgrprotos.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "moddatetime",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(moddatetime);

--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@ -15,7 +15,10 @@
 #include "utils/memutils.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "refint",
+					.version = PG_VERSION
+);

 typedef struct
 {
--- a/contrib/sslinfo/sslinfo.c
+++ b/contrib/sslinfo/sslinfo.c
@ -19,7 +19,10 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "sslinfo",
+					.version = PG_VERSION
+);

 static Datum X509_NAME_field_to_text(X509_NAME *name, text *fieldName);
 static Datum ASN1_STRING_to_text(ASN1_STRING *str);
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@ -44,7 +44,10 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "tablefunc",
+					.version = PG_VERSION
+);

 static HTAB *load_categories_hash(char *cats_sql, MemoryContext per_query_ctx);
 static Tuplestorestate *get_crosstab_tuplestore(char *sql,
--- a/contrib/tcn/tcn.c
+++ b/contrib/tcn/tcn.c
@ -23,7 +23,10 @@
 #include "utils/rel.h"
 #include "utils/syscache.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "tcn",
+					.version = PG_VERSION
+);

 /*
 * Copy from s (for source) to r (for result), wrapping with q (quote)
--- a/contrib/test_decoding/test_decoding.c
+++ b/contrib/test_decoding/test_decoding.c
@ -22,7 +22,10 @@
 #include "utils/memutils.h"
 #include "utils/rel.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "test_decoding",
+					.version = PG_VERSION
+);

 typedef struct
 {
--- a/contrib/tsm_system_rows/tsm_system_rows.c
+++ b/contrib/tsm_system_rows/tsm_system_rows.c
@ -34,7 +34,10 @@
 #include "optimizer/optimizer.h"
 #include "utils/sampling.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "tsm_system_rows",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(tsm_system_rows_handler);

--- a/contrib/tsm_system_time/tsm_system_time.c
+++ b/contrib/tsm_system_time/tsm_system_time.c
@ -33,7 +33,10 @@
 #include "utils/sampling.h"
 #include "utils/spccache.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "tsm_system_time",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(tsm_system_time_handler);

--- a/contrib/unaccent/unaccent.c
+++ b/contrib/unaccent/unaccent.c
@ -23,7 +23,10 @@
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "unaccent",
+					.version = PG_VERSION
+);

 /*
 * An unaccent dictionary uses a trie to find a string to replace.  Each node
--- a/contrib/uuid-ossp/uuid-ossp.c
+++ b/contrib/uuid-ossp/uuid-ossp.c
@ -102,7 +102,10 @@ do { \

 #endif							/* !HAVE_UUID_OSSP */

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "uuid-ossp",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(uuid_nil);
 PG_FUNCTION_INFO_V1(uuid_ns_dns);
--- a/contrib/xml2/xpath.c
+++ b/contrib/xml2/xpath.c
@ -22,7 +22,10 @@
 #include <libxml/xmlerror.h>
 #include <libxml/parserInternals.h>

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "xml2",
+					.version = PG_VERSION
+);

 /* exported for use by xslt_proc.c */

--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@ -138,7 +138,10 @@ ResourceOwnerForgetJIT(ResourceOwner owner, LLVMJitContext *handle)
 	ResourceOwnerForget(owner, PointerGetDatum(handle), &jit_resowner_desc);
 }

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "llvmjit",
+					.version = PG_VERSION
+);


 /*
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@ -36,7 +36,10 @@
 #include "utils/pg_lsn.h"
 #include "utils/tuplestore.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "libpqwalreceiver",
+					.version = PG_VERSION
+);

 struct WalReceiverConn
 {
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@ -36,7 +36,10 @@
 #include "utils/syscache.h"
 #include "utils/varlena.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pgoutput",
+					.version = PG_VERSION
+);

 static void pgoutput_startup(LogicalDecodingContext *ctx,
 							 OutputPluginOptions *opt, bool is_init);
--- a/src/backend/snowball/dict_snowball.c
+++ b/src/backend/snowball/dict_snowball.c
@ -77,7 +77,10 @@
 #include "snowball/libstemmer/stem_UTF_8_turkish.h"
 #include "snowball/libstemmer/stem_UTF_8_yiddish.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "dict_snowball",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(dsnowball_init);

--- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
@ -15,7 +15,10 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "cyrillic_and_mic",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(koi8r_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_koi8r);
--- a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
+++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
@ -14,7 +14,10 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "euc2004_sjis2004",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_jis_2004_to_shift_jis_2004);
 PG_FUNCTION_INFO_V1(shift_jis_2004_to_euc_jis_2004);
--- a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
@ -15,7 +15,10 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "euc_cn_and_mic",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_cn_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_euc_cn);
--- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
+++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
@ -27,7 +27,10 @@
 */
 #include "sjis.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "euc_jp_and_sjis",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_jp_to_sjis);
 PG_FUNCTION_INFO_V1(sjis_to_euc_jp);
--- a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
@ -15,7 +15,10 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "euc_kr_and_mic",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_kr_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_euc_kr);
--- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
+++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
@ -15,7 +15,10 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "euc_tw_and_big5",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_tw_to_big5);
 PG_FUNCTION_INFO_V1(big5_to_euc_tw);
--- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
+++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
@ -15,7 +15,10 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "latin2_and_win1250",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(latin2_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_latin2);
--- a/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
@ -15,7 +15,10 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "latin_and_mic",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(latin1_to_mic);
 PG_FUNCTION_INFO_V1(mic_to_latin1);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
@ -17,7 +17,10 @@
 #include "../../Unicode/big5_to_utf8.map"
 #include "../../Unicode/utf8_to_big5.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_big5",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(big5_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_big5);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@ -19,7 +19,10 @@
 #include "../../Unicode/utf8_to_koi8u.map"
 #include "../../Unicode/koi8u_to_utf8.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_cyrillic",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(utf8_to_koi8r);
 PG_FUNCTION_INFO_V1(koi8r_to_utf8);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c
@ -17,7 +17,10 @@
 #include "../../Unicode/euc_jis_2004_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_jis_2004.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_euc2004",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_jis_2004_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_jis_2004);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
@ -17,7 +17,10 @@
 #include "../../Unicode/euc_cn_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_cn.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_euc_cn",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_cn_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_cn);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
@ -17,7 +17,10 @@
 #include "../../Unicode/euc_jp_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_jp.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_euc_jp",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_jp_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_jp);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
@ -17,7 +17,10 @@
 #include "../../Unicode/euc_kr_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_kr.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_euc_kr",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_kr_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_kr);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
@ -17,7 +17,10 @@
 #include "../../Unicode/euc_tw_to_utf8.map"
 #include "../../Unicode/utf8_to_euc_tw.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_euc_tw",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(euc_tw_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_euc_tw);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
@ -17,7 +17,10 @@
 #include "../../Unicode/gb18030_to_utf8.map"
 #include "../../Unicode/utf8_to_gb18030.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_gb18030",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(gb18030_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_gb18030);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
@ -17,7 +17,10 @@
 #include "../../Unicode/gbk_to_utf8.map"
 #include "../../Unicode/utf8_to_gbk.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_gbk",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(gbk_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_gbk);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@ -41,7 +41,10 @@
 #include "../../Unicode/utf8_to_iso8859_9.map"
 #include "../../Unicode/iso8859_16_to_utf8.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_iso8859",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(iso8859_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_iso8859);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
@ -15,7 +15,10 @@
 #include "fmgr.h"
 #include "mb/pg_wchar.h"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_iso8859_1",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(iso8859_1_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_iso8859_1);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
@ -17,7 +17,10 @@
 #include "../../Unicode/johab_to_utf8.map"
 #include "../../Unicode/utf8_to_johab.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_johab",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(johab_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_johab);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
@ -17,7 +17,10 @@
 #include "../../Unicode/sjis_to_utf8.map"
 #include "../../Unicode/utf8_to_sjis.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_sjis",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(sjis_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_sjis);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c
@ -17,7 +17,10 @@
 #include "../../Unicode/shift_jis_2004_to_utf8.map"
 #include "../../Unicode/utf8_to_shift_jis_2004.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_sjis2004",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(shift_jis_2004_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_shift_jis_2004);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
@ -17,7 +17,10 @@
 #include "../../Unicode/uhc_to_utf8.map"
 #include "../../Unicode/utf8_to_uhc.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_uhc",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(uhc_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_uhc);
--- a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
@ -37,7 +37,10 @@
 #include "../../Unicode/win874_to_utf8.map"
 #include "../../Unicode/win1258_to_utf8.map"

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "utf8_and_win",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(win_to_utf8);
 PG_FUNCTION_INFO_V1(utf8_to_win);
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@ -52,7 +52,10 @@ EXTERN_C void boot_DynaLoader(pTHX_ CV *cv);
 EXTERN_C void boot_PostgreSQL__InServer__Util(pTHX_ CV *cv);
 EXTERN_C void boot_PostgreSQL__InServer__SPI(pTHX_ CV *cv);

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "plperl",
+					.version = PG_VERSION
+);

 /**********************************************************************
 * Information associated with a Perl interpreter.  We have one interpreter
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@ -31,7 +31,10 @@ static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSo
 static void plpgsql_extra_warnings_assign_hook(const char *newvalue, void *extra);
 static void plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra);

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "plpgsql",
+					.version = PG_VERSION
+);

 /* Custom GUC variable */
 static const struct config_enum_entry variable_conflict_options[] = {
--- a/src/pl/plpython/plpy_main.c
+++ b/src/pl/plpython/plpy_main.c
@ -28,7 +28,10 @@
 * exported functions
 */

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "plpython",
+					.version = PG_VERSION
+);

 PG_FUNCTION_INFO_V1(plpython3_validator);
 PG_FUNCTION_INFO_V1(plpython3_call_handler);
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@ -39,7 +39,10 @@
 #include "utils/typcache.h"


-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "pltcl",
+					.version = PG_VERSION
+);

 #define HAVE_TCL_VERSION(maj,min) \
 	((TCL_MAJOR_VERSION > maj) || \
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@ -79,7 +79,10 @@

 static void regress_lseg_construct(LSEG *lseg, Point *pt1, Point *pt2);

-PG_MODULE_MAGIC;
+PG_MODULE_MAGIC_EXT(
+					.name = "regress",
+					.version = PG_VERSION
+);


 /* return the point where two paths intersect, or NULL if no intersection. */