Fix duplicate typedef from commit 0d8c9c121.
authorTom Lane <tgl@sss.pgh.pa.us>
Tue, 21 Apr 2020 15:13:05 +0000 (11:13 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Tue, 21 Apr 2020 15:13:05 +0000 (11:13 -0400)
Older gcc versions don't like duplicate typedefs, so get rid of
that in favor of doing it like we do it elsewhere, ie just use
a "struct" declaration when trying to avoid importing a whole
header file.

Also, there seems no reason to include stringinfo.h here at all,
so get rid of that addition too.

Discussion: https://postgr.es/m/27239.1587415696@sss.pgh.pa.us

src/include/replication/basebackup.h

index d5b594c928d243d9a2d115a59948ac20f6114644..f6a7422cbc706c1b2bfe6680b60d24a4e3ea7ba6 100644 (file)
 #ifndef _BASEBACKUP_H
 #define _BASEBACKUP_H
 
-#include "lib/stringinfo.h"
 #include "nodes/replnodes.h"
 
+struct manifest_info;          /* avoid including backup_manifest.h */
+
+
 /*
  * Minimum and maximum values of MAX_RATE option in BASE_BACKUP command.
  */
 #define MAX_RATE_LOWER 32
 #define MAX_RATE_UPPER 1048576
 
-
 typedef struct
 {
    char       *oid;
@@ -30,12 +31,9 @@ typedef struct
    int64       size;
 } tablespaceinfo;
 
-struct manifest_info;
-typedef struct manifest_info manifest_info;
-
 extern void SendBaseBackup(BaseBackupCmd *cmd);
 
 extern int64 sendTablespace(char *path, char *oid, bool sizeonly,
-                           manifest_info *manifest);
+                           struct manifest_info *manifest);
 
 #endif                         /* _BASEBACKUP_H */