Fix include files for new PageOutput call.

src/bin/psql/common.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.49 2002/10/23 19:23:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.50 2002/10/24 01:33:50 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -25,6 +25,17 @@
 #include <sys/timeb.h>			/* for _ftime() */
 #endif
 
+#ifndef WIN32
+#include <sys/ioctl.h>			/* for ioctl() */
+#else
+#define popen(x,y) _popen(x,y)
+#define pclose(x) _pclose(x)
+#endif
+
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+
 #include "libpq-fe.h"
 #include "pqsignal.h"
 

src/bin/psql/help.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.59 2002/10/23 19:23:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.60 2002/10/24 01:33:50 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -14,7 +14,6 @@
 #include <errno.h>
 
 #ifndef WIN32
-#include <sys/ioctl.h>			/* for ioctl() */
 #ifdef HAVE_PWD_H
 #include <pwd.h>				/* for getpwuid() */
 #endif

src/bin/psql/print.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.33 2002/10/23 19:23:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.34 2002/10/24 01:33:50 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -11,23 +11,12 @@
 
 #include <math.h>
 #include <signal.h>
-#ifndef WIN32
-#include <unistd.h>				/* for isatty() */
-#include <sys/ioctl.h>			/* for ioctl() */
-#else
-#define popen(x,y) _popen(x,y)
-#define pclose(x) _pclose(x)
-#endif
 
 #include "pqsignal.h"
 #include "libpq-fe.h"
 
 #include "settings.h"
 
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
 #include "mbprint.h"
 
 /*************************/