database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-10 09:21:54 +03:00
Code

Prevent redeclaration of typedef TocEntry.

Browse Source 
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.
This commit is contained in:
Nathan Bossart 2025-04-04 15:56:23 -05:00
parent 289f74d0cb
commit 8ec0aaeae0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/pg_dump/pg_backup.h
View File

@ -286,7 +286,10 @@ typedef int DumpId;
*/ */
/* forward declaration to avoid including pg_backup_archiver.h here */ /* forward declaration to avoid including pg_backup_archiver.h here */
#ifndef HAVE_TOCENTRY_TYPEDEF
typedef struct _tocEntry TocEntry; typedef struct _tocEntry TocEntry;
#define HAVE_TOCENTRY_TYPEDEF 1
#endif
typedef char *(*DefnDumperPtr) (Archive *AH, const void *userArg, const TocEntry *te); typedef char *(*DefnDumperPtr) (Archive *AH, const void *userArg, const TocEntry *te);
typedef int (*DataDumperPtr) (Archive *AH, const void *userArg); typedef int (*DataDumperPtr) (Archive *AH, const void *userArg);

3
src/bin/pg_dump/pg_backup_archiver.h
View File

@ -97,7 +97,10 @@
#define WORKER_IGNORED_ERRORS 12 #define WORKER_IGNORED_ERRORS 12
typedef struct _archiveHandle ArchiveHandle; typedef struct _archiveHandle ArchiveHandle;
#ifndef HAVE_TOCENTRY_TYPEDEF
typedef struct _tocEntry TocEntry; typedef struct _tocEntry TocEntry;
#define HAVE_TOCENTRY_TYPEDEF 1
#endif
struct ParallelState; struct ParallelState;
#define READ_ERROR_EXIT(fd) \ #define READ_ERROR_EXIT(fd) \