Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8ec0aae

Browse files
Prevent redeclaration of typedef TocEntry.
Commit9c02e3a added a forward declaration for this typedef thatcaused redeclarations, which is not valid in C99. To fix, add somepreprocessor guards to avoid a redefinition, as is done elsewhere(e.g., commit382092a).Per buildfarm.
1 parent289f74d commit8ec0aae

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

‎src/bin/pg_dump/pg_backup.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,10 @@ typedef int DumpId;
286286
*/
287287

288288
/* forward declaration to avoid including pg_backup_archiver.h here */
289+
#ifndefHAVE_TOCENTRY_TYPEDEF
289290
typedefstruct_tocEntryTocEntry;
291+
#defineHAVE_TOCENTRY_TYPEDEF 1
292+
#endif
290293

291294
typedefchar*(*DefnDumperPtr) (Archive*AH,constvoid*userArg,constTocEntry*te);
292295
typedefint (*DataDumperPtr) (Archive*AH,constvoid*userArg);

‎src/bin/pg_dump/pg_backup_archiver.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@
9797
#defineWORKER_IGNORED_ERRORS 12
9898

9999
typedefstruct_archiveHandleArchiveHandle;
100+
#ifndefHAVE_TOCENTRY_TYPEDEF
100101
typedefstruct_tocEntryTocEntry;
102+
#defineHAVE_TOCENTRY_TYPEDEF 1
103+
#endif
101104
structParallelState;
102105

103106
#defineREAD_ERROR_EXIT(fd) \

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp