another set of cleanups

src/bin/psql/common.h

@@ -1,22 +1,33 @@
+/*
+ * psql - the PostgreSQL interactive terminal
+ *
+ * Copyright 2000 by PostgreSQL Global Development Team
+ *
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.4 2000/01/18 23:30:23 petere Exp $
+ */
 #ifndef COMMON_H
 #define COMMON_H
 
 #include <c.h>
-#include "settings.h"
+#include <libpq-fe.h>
 
-char *
-			xstrdup(const char *string);
+char *		xstrdup(const char *string);
 
-bool
-			setQFout(const char *fname);
+bool		setQFout(const char *fname);
 
-char *
-			simple_prompt(const char *prompt, int maxlen, bool echo);
+#ifndef __GNUC__
+void        psql_error(const char *fmt, ...);
+#else
+/* This checks the format string for consistency. */
+void        psql_error(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
+#endif
 
-PGresult   *
-			PSQLexec(const char *query);
+void        NoticeProcessor(void * arg, const char * message);
 
-bool
-			SendQuery(const char *query);
+char *		simple_prompt(const char *prompt, int maxlen, bool echo);
+
+PGresult *	PSQLexec(const char *query);
+
+bool		SendQuery(const char *query);
 
 #endif	 /* COMMON_H */