Minor #include cleanup.

tglsfdc · tglsfdc · commit 3f9479ef3fdf · 2010-08-13T20:04:33.000Z
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.
diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c
@@ -9,18 +9,21 @@
  *
  *
  * 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
  *		things need it...
  *
  *-------------------------------------------------------------------------
  */
-#include "pqsignal.h"
+#include "postgres_fe.h"
 
 #include <signal.h>
 
+#include "pqsignal.h"
+
+
 pqsigfunc
 pqsignal(int signo, pqsigfunc func)
 {
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,21 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.30 2010/01/02 16:58:12 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.31 2010/08/13 20:04:33 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`* NOTES`
`15`	`15`	`* This shouldn't be in libpq, but the monitor and some other`
`16`	`16`	`* things need it...`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`20`		`-#include "pqsignal.h"`
	`20`	`+#include "postgres_fe.h"`
`21`	`21`
`22`	`22`	`#include <signal.h>`
`23`	`23`
	`24`	`+#include "pqsignal.h"`
	`25`	`+`
	`26`	`+`
`24`	`27`	`pqsigfunc`
`25`	`28`	`pqsignal(int signo, pqsigfunc func)`
`26`	`29`	`{`