From 8ec0aaeae09482925d2d15ce4a91f6953bdb1566 Mon Sep 17 00:00:00 2001 From: Nathan Bossart Date: Fri, 4 Apr 2025 15:56:23 -0500 Subject: [PATCH] Prevent redeclaration of typedef TocEntry. Commit 9c02e3a986 added a forward declaration for this typedef that caused redeclarations, which is not valid in C99. To fix, add some preprocessor guards to avoid a redefinition, as is done elsewhere (e.g., commit 382092a0cd). Per buildfarm. --- src/bin/pg_dump/pg_backup.h | 3 +++ src/bin/pg_dump/pg_backup_archiver.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h index 5c8c1b3ea0a..8586cdaf541 100644 --- a/src/bin/pg_dump/pg_backup.h +++ b/src/bin/pg_dump/pg_backup.h @@ -286,7 +286,10 @@ typedef int DumpId; */ /* forward declaration to avoid including pg_backup_archiver.h here */ +#ifndef HAVE_TOCENTRY_TYPEDEF typedef struct _tocEntry TocEntry; +#define HAVE_TOCENTRY_TYPEDEF 1 +#endif typedef char *(*DefnDumperPtr) (Archive *AH, const void *userArg, const TocEntry *te); typedef int (*DataDumperPtr) (Archive *AH, const void *userArg); diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index 859fbd322d1..e81a76ba25e 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -97,7 +97,10 @@ #define WORKER_IGNORED_ERRORS 12 typedef struct _archiveHandle ArchiveHandle; +#ifndef HAVE_TOCENTRY_TYPEDEF typedef struct _tocEntry TocEntry; +#define HAVE_TOCENTRY_TYPEDEF 1 +#endif struct ParallelState; #define READ_ERROR_EXIT(fd) \ -- 2.30.2