Skip to content

Commit d66997d

Browse files
committed
Avoid mixing designated and non-designated field initializers.
As revised by commit 9324c8c, PG_MODULE_MAGIC constructed a struct initializer containing both designated fields and a non-designated "0". That's okay in C, but not in C++, with the result that extensions written in C++ failed to compile. Change it to use only designated field initializers. Author: Yurii Rashkovskii <yrashk@omnigres.com> Discussion: https://postgr.es/m/CAG=VW14mctsR543gpzLCuJ9JgJqwa=ptmBfGvxEjs+k8Jf7-Bg@mail.gmail.com
1 parent 0f3604a commit d66997d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/include/fmgr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ extern PGDLLEXPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \
522522
const Pg_magic_struct * \
523523
PG_MAGIC_FUNCTION_NAME(void) \
524524
{ \
525-
static const Pg_magic_struct Pg_magic_data = PG_MODULE_MAGIC_DATA(0); \
525+
static const Pg_magic_struct Pg_magic_data = PG_MODULE_MAGIC_DATA(.name = NULL); \
526526
return &Pg_magic_data; \
527527
} \
528528
extern int no_such_variable

0 commit comments

Comments
 (0)