Skip to content

Commit c5d4e87

Browse files
committed
Use PG_MODULE_MAGIC_EXT for PG18
postgres/postgres@9324c8c58065
1 parent ff980e6 commit c5d4e87

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

src/compat/compat.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,3 +869,14 @@ ItemPointerGetDatum(const ItemPointerData *X)
869869
return PointerGetDatum(X);
870870
}
871871
#endif
872+
873+
#if PG18_GE
874+
#ifdef PG_MODULE_MAGIC_EXT
875+
#define TS_MODULE_MAGIC \
876+
PG_MODULE_MAGIC_EXT(.name = "timescaledb", .version = TIMESCALEDB_VERSION_MOD)
877+
#endif
878+
#else
879+
#ifdef PG_MODULE_MAGIC
880+
#define TS_MODULE_MAGIC PG_MODULE_MAGIC
881+
#endif
882+
#endif

src/init.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
#include "ts_catalog/catalog.h"
2323
#include "version.h"
2424

25-
#ifdef PG_MODULE_MAGIC
26-
PG_MODULE_MAGIC;
27-
#endif
25+
TS_MODULE_MAGIC;
2826

2927
extern void _hypertable_cache_init(void);
3028
extern void _hypertable_cache_fini(void);

src/loader/loader.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@
8383
*
8484
*/
8585

86-
#ifdef PG_MODULE_MAGIC
87-
PG_MODULE_MAGIC;
88-
#endif
86+
TS_MODULE_MAGIC;
8987

9088
#define POST_LOAD_INIT_FN "ts_post_load_init"
9189
#define GUC_LAUNCHER_POLL_TIME_MS MAKE_EXTOPTION("bgw_launcher_poll_time")

tsl/src/continuous_aggs/invalidation_plugin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include "invalidation_record.h"
4141
#include "utils.h"
4242

43-
PG_MODULE_MAGIC;
43+
TS_MODULE_MAGIC;
4444

4545
#if PG16_LT
4646
extern TSDLLEXPORT void _PG_output_plugin_init(OutputPluginCallbacks *cb);

tsl/src/init.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@
5050
#include "process_utility.h"
5151
#include "reorder.h"
5252

53-
#ifdef PG_MODULE_MAGIC
54-
PG_MODULE_MAGIC;
55-
#endif
53+
TS_MODULE_MAGIC;
5654

5755
#ifdef APACHE_ONLY
5856
#error "cannot compile the TSL for ApacheOnly mode"

0 commit comments

Comments
 (0)