Fix include files for new PageOutput call.

diff --git a/configure b/configure
index 70e18ea7d5a0678a1f2a963a21f30354a6adb7c1..83a54bc69116bd0e93f59612829ac70230530cd2 100755 (executable)
--- a/configure
+++ b/configure
@@ -10543,6 +10543,12 @@ done
 
 
 
+# BSD/OS has a custom fseeko/ftello built on fsetpos/fgetpos
+# We override the previous test that said fseeko/ftello didn't exist
+case $host_os in bsdi*)
+ac_cv_func_fseeko=yes
+esac
+
 # Solaris has a very slow qsort in certain cases.
 case $host_os in
   solaris*) LIBOBJS="$LIBOBJS qsort.$ac_objext" ;;
@@ -11471,12 +11477,6 @@ fi
 done
 
 
-# BSD/OS has a custom fseeko/ftello built on fsetpos/fgetpos
-# We override the previous test that said fseeko/ftello didn't exist
-case $host_os in bsdi*)
-ac_cv_func_fseeko=yes
-esac
-
 echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then

diff --git a/configure.in b/configure.in
index 15cb4ff96dedb1c64f73dc2a3a8117eaa64212b2..94a474914527279b52834513bf0f37f1e62870c9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -837,6 +837,12 @@ fi
 
 AC_REPLACE_FUNCS([fseeko gethostname getrusage inet_aton random srandom strcasecmp strdup strerror strtol strtoul])
 
+# BSD/OS has a custom fseeko/ftello built on fsetpos/fgetpos
+# We override the previous test that said fseeko/ftello didn't exist
+case $host_os in bsdi*)
+ac_cv_func_fseeko=yes
+esac
+
 # Solaris has a very slow qsort in certain cases.
 case $host_os in 
   solaris*) AC_LIBOBJ(qsort) ;;
@@ -903,12 +909,6 @@ AC_CHECK_FUNCS(atexit, [],
                [AC_CHECK_FUNCS(on_exit, [],
                                [AC_MSG_ERROR([neither atexit() nor on_exit() found])])])
 
-# BSD/OS has a custom fseeko/ftello built on fsetpos/fgetpos
-# We override the previous test that said fseeko/ftello didn't exist
-case $host_os in bsdi*)
-ac_cv_func_fseeko=yes
-esac
-
 AC_FUNC_FSEEKO
 
 

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 6cffc05b19a869f8cf38d71773d95a3da68d9c20..1f0265bf5d410db724aa1c9d74a4cda210d7fea5 100644 (file)
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -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"
 

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index b4a707c56d1683ba385d36a169698c7b6de155fe..9468af0939b97248af4f5c514e299663a86818da 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -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

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 6c3a3d860690509f9a0d3083d70341a9f63edf51..330b2ce9a03a0989cc6b0445fa1b07b939307843 100644 (file)
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -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"
 
 /*************************/