summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Vondra2016-03-01 03:45:56 +0000
committerPavan Deolasee2016-10-18 10:00:51 +0000
commit43ef6270410a6e58fd5efce7df4d37fa0305ead1 (patch)
treed89910f51892ccd695e8de1ce181ae2109aa1406
parent986f0339fa0b959d7e1560b4be5781d002af50ae (diff)
fix missing prototypes (and 'implicit declaration' warning)
-rw-r--r--src/backend/bootstrap/bootstrap.c1
-rw-r--r--src/backend/rewrite/rewriteHandler.c1
-rw-r--r--src/backend/storage/ipc/ipci.c1
-rw-r--r--src/backend/utils/init/postinit.c1
-rw-r--r--src/include/postmaster/clustermon.h6
-rw-r--r--src/include/tcop/tcopprot.h1
6 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 2a287ca3be..6707724ddf 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -49,6 +49,7 @@
#ifdef PGXC
#include "nodes/nodes.h"
#include "pgxc/poolmgr.h"
+#include "postmaster/clustermon.h"
#endif
uint32 bootstrap_data_checksum_version = 0; /* No checksum */
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 45a22ee537..d3f34df221 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -14,6 +14,7 @@
#include "postgres.h"
#include "access/sysattr.h"
+#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "commands/trigger.h"
#include "foreign/fdwapi.h"
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 37df00803c..4535a3eb82 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -27,6 +27,7 @@
#include "pgstat.h"
#ifdef PGXC
#include "pgxc/nodemgr.h"
+#include "postmaster/clustermon.h"
#endif
#include "postmaster/autovacuum.h"
#include "postmaster/clustermon.h"
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 73b541ae2d..4803cea2c4 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -39,6 +39,7 @@
#include "pgstat.h"
#ifdef XCP
#include "pgxc/pgxc.h"
+#include "postmaster/clustermon.h"
#endif
#include "postmaster/autovacuum.h"
#include "postmaster/clustermon.h"
diff --git a/src/include/postmaster/clustermon.h b/src/include/postmaster/clustermon.h
index 953d6787eb..ca9dc1b304 100644
--- a/src/include/postmaster/clustermon.h
+++ b/src/include/postmaster/clustermon.h
@@ -26,19 +26,17 @@ typedef struct
GlobalTransactionId gtm_recent_global_xmin;
} ClusterMonitorCtlData;
+extern void ClusterMonitorShmemInit(void);
extern Size ClusterMonitorShmemSize(void);
/* Status inquiry functions */
extern bool IsClusterMonitorProcess(void);
/* Functions to start cluster monitor process, called from postmaster */
+int ClusterMonitorInit(void);
extern int StartClusterMonitor(void);
GlobalTransactionId ClusterMonitorGetGlobalXmin(void);
void ClusterMonitorSetGlobalXmin(GlobalTransactionId xmin);
-extern GlobalTransactionId ClusterMonitorGetReportingGlobalXmin(void);
-
-Size ClusterMonitorShmemSize(void);
-void ClusterMonitorShmemInit(void);
#ifdef EXEC_BACKEND
extern void ClusterMonitorIAm(void);
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 3a6812adeb..c91fa848eb 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -81,6 +81,7 @@ extern void PostgresMain(int argc, char *argv[],
const char *username) pg_attribute_noreturn();
extern long get_stack_depth_rlimit(void);
extern void ResetUsage(void);
+extern void ResetUsageCommon(struct rusage *save_r, struct timeval *save_t);
extern void ResetUsageGeneric(struct rusage *save_r, struct timeval *save_t);
extern void ShowUsage(const char *title);
extern void ShowUsageCommon(const char *title, struct rusage *save_r,