Fix a myriad of problems introduced by merging

Signed-off-by: Dan Farina <drfarina@acm.org>
This commit is contained in:
Dan Farina
2011-02-06 18:32:49 -08:00
parent c356f9e97f
commit bfd3aed33b
7 changed files with 79 additions and 59 deletions

View File

@@ -17,14 +17,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef _REPMGR_H_
#define _REPMGR_H_
#include "postgres_fe.h"
#include "getopt_long.h"
#include "libpq-fe.h"
#ifndef _REPMGR_H_
#define _REPMGR_H_
#include "dbutils.h"
@@ -32,7 +32,6 @@
#define STANDBY_MODE 1
#define CONFIG_FILE "repmgr.conf"
#define QUERY_STR_LEN 8192
#include "config.h"