From 42bbd89f6484afd10f93fd1f22f72d37ac0922b5 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 10 Nov 2009 23:12:37 +0000
Subject: [PATCH] Do not build psql's flex module on its own, but instead
 include it in mainloop.c.  This ensures that postgres_fe.h is read before
 including any system headers, which is necessary to avoid problems on some
 platforms where we make nondefault selections of feature macros for stdio.h
 or other headers.  We have had this policy for flex modules in the backend
 for many years, but for some reason it was not applied to psql. Per trouble
 report from Alexandra Roy and diagnosis by Albe Laurenz.

---
 src/bin/psql/Makefile   |  7 +++++--
 src/bin/psql/mainloop.c | 12 +++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index a8d5164eae4..82fd92fdd54 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.57 2006/03/05 15:58:51 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.57.2.1 2009/11/10 23:12:37 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -21,7 +21,7 @@ override CPPFLAGS := -DFRONTEND -I$(srcdir) -I$(libpq_srcdir) -I$(top_srcdir)/sr
 
 OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
 	startup.o prompt.o variables.o large_obj.o print.o describe.o \
-	psqlscan.o tab-complete.o mbprint.o dumputils.o $(WIN32RES)
+	tab-complete.o mbprint.o dumputils.o $(WIN32RES)
 
 EXTRA_OBJS = $(top_builddir)/src/backend/parser/keywords.o
 
@@ -46,6 +46,9 @@ $(srcdir)/sql_help.h:
 	@echo "*** Perl is needed to build psql help."
 endif
 
+# psqlscan is compiled as part of mainloop
+mainloop.o: psqlscan.c
+
 $(srcdir)/psqlscan.c: psqlscan.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -o'$@' $<
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index d597cb3d753..57e731eb801 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.84 2006/10/04 00:30:06 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.84.2.1 2009/11/10 23:12:37 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "mainloop.h"
@@ -366,3 +366,13 @@ MainLoop(FILE *source)
 
 	return successResult;
 }	/* MainLoop() */
+
+
+/*
+ * psqlscan.c is #include'd here instead of being compiled on its own.
+ * This is because we need postgres_fe.h to be read before any system
+ * include files, else things tend to break on platforms that have
+ * multiple infrastructures for stdio.h and so on.  flex is absolutely
+ * uncooperative about that, so we can't compile psqlscan.c on its own.
+ */
+#include "psqlscan.c"