From 3f9479ef3fdf49fc22088be5268fa536cf5d4efd Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 13 Aug 2010 20:04:33 +0000 Subject: [PATCH] Minor #include cleanup. I just noticed that libpq's pqsignal.h was violating our general inclusion style guidelines by explicitly including postgres_fe.h. Remove that, and put it in pqsignal.c where it belongs. --- src/interfaces/libpq/pqsignal.c | 7 +++++-- src/interfaces/libpq/pqsignal.h | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c index 21bc141b34..2122fda6c7 100644 --- a/src/interfaces/libpq/pqsignal.c +++ b/src/interfaces/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.30 2010/01/02 16:58:12 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.31 2010/08/13 20:04:33 tgl Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -17,10 +17,13 @@ * *------------------------------------------------------------------------- */ -#include "pqsignal.h" +#include "postgres_fe.h" #include +#include "pqsignal.h" + + pqsigfunc pqsignal(int signo, pqsigfunc func) { diff --git a/src/interfaces/libpq/pqsignal.h b/src/interfaces/libpq/pqsignal.h index 43322f917a..9d22854415 100644 --- a/src/interfaces/libpq/pqsignal.h +++ b/src/interfaces/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.25 2010/01/02 16:58:12 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.26 2010/08/13 20:04:33 tgl Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -18,8 +18,6 @@ #ifndef PQSIGNAL_H #define PQSIGNAL_H -#include "postgres_fe.h" - typedef void (*pqsigfunc) (int); extern pqsigfunc pqsignal(int signo, pqsigfunc func); -- 2.11.0