From 5460517a43a9f39f87676dc71898df3d33b9fb83 Mon Sep 17 00:00:00 2001 From: Greg Smith Date: Thu, 10 Feb 2011 18:35:56 -0500 Subject: [PATCH] Protect against duplicate header inclusion --- check_dir.h | 5 +++++ config.h | 4 ++-- dbutils.h | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/check_dir.h b/check_dir.h index 201c1d16..37a14fe5 100644 --- a/check_dir.h +++ b/check_dir.h @@ -17,7 +17,12 @@ * */ +#ifndef _REPMGR_CHECK_DIR_H_ +#define _REPMGR_CHECK_DIR_H_ + int check_dir(char *dir); bool create_directory(char *dir); bool set_directory_permissions(char *dir); bool is_pg_dir(char *dir); + +#endif diff --git a/config.h b/config.h index c7749883..5e9cc36e 100644 --- a/config.h +++ b/config.h @@ -17,8 +17,8 @@ * */ -#ifndef _CONFIG_H_ -#define _CONFIG_H_ +#ifndef _REPMGR_CONFIG_H_ +#define _REPMGR_CONFIG_H_ #include "repmgr.h" diff --git a/dbutils.h b/dbutils.h index 2d05e953..23ed4afe 100644 --- a/dbutils.h +++ b/dbutils.h @@ -17,9 +17,14 @@ * */ +#ifndef _REPMGR_DBUTILS_H_ +#define _REPMGR_DBUTILS_H_ + PGconn *establishDBConnection(const char *conninfo, const bool exit_on_error); bool is_standby(PGconn *conn); char *pg_version(PGconn *conn, char* major_version); bool guc_setted(PGconn *conn, const char *parameter, const char *op, const char *value); const char *get_cluster_size(PGconn *conn); PGconn * getMasterConnection(PGconn *standby_conn, int id, char *cluster, int *master_id); + +#endif