From 46eef3c1a30256069859659fedd96309f3175802 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 4 Sep 2002 22:49:37 +0000
Subject: [PATCH] Fix includes for plperl: ensure postgres.h is included first,
 remove unnecessary inclusions.

---
 src/pl/plperl/SPI.xs   | 23 ++---------------------
 src/pl/plperl/plperl.c |  7 +------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs
index ca8030ae3f..c1eb2576ff 100644
--- a/src/pl/plperl/SPI.xs
+++ b/src/pl/plperl/SPI.xs
@@ -1,24 +1,5 @@
-/* system stuff */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <string.h>
-#include <setjmp.h>
-
-/* postgreSQL stuff */
-#include "executor/spi.h"
-#include "commands/trigger.h"
-#include "utils/elog.h"
-#include "utils/builtins.h"
-#include "fmgr.h"
-#include "access/heapam.h"
-
-#include "tcop/tcopprot.h"
-#include "utils/syscache.h"
-#include "catalog/pg_proc.h"
-#include "catalog/pg_type.h"
+/* this must be first: */
+#include "postgres.h"
 
 /* perl stuff */
 #include "EXTERN.h"
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 8d94d28ee8..2fe9f688ac 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,19 +33,15 @@
  *	  ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.33 2002/09/04 20:31:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plperl/plperl.c,v 1.34 2002/09/04 22:49:37 tgl Exp $
  *
  **********************************************************************/
 
 #include "postgres.h"
 
 /* system stuff */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <string.h>
 #include <setjmp.h>
 
 /* postgreSQL stuff */
@@ -54,7 +50,6 @@
 #include "utils/elog.h"
 #include "fmgr.h"
 #include "access/heapam.h"
-
 #include "tcop/tcopprot.h"
 #include "utils/syscache.h"
 #include "catalog/pg_language.h"