Skip to content

Commit b093f88

Browse files
bmomjianbmomjian
committed
Fix include files for new PageOutput call.
1 parent f142b09 commit b093f88

File tree

5 files changed

+27
-28
lines changed

5 files changed

+27
-28
lines changed

‎configure

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10543,6 +10543,12 @@ done
1054310543
1054410544
1054510545
10546+
# BSD/OS has a custom fseeko/ftello built on fsetpos/fgetpos
10547+
# We override the previous test that said fseeko/ftello didn't exist
10548+
case $host_os in bsdi*)
10549+
ac_cv_func_fseeko=yes
10550+
esac
10551+
1054610552
# Solaris has a very slow qsort in certain cases.
1054710553
case $host_os in
1054810554
solaris*) LIBOBJS="$LIBOBJS qsort.$ac_objext" ;;
@@ -11471,12 +11477,6 @@ fi
1147111477
done
1147211478
1147311479
11474-
# BSD/OS has a custom fseeko/ftello built on fsetpos/fgetpos
11475-
# We override the previous test that said fseeko/ftello didn't exist
11476-
case $host_os in bsdi*)
11477-
ac_cv_func_fseeko=yes
11478-
esac
11479-
1148011480
echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
1148111481
echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
1148211482
if test "${ac_cv_sys_largefile_source+set}" = set; then

‎configure.in

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.213 2002/10/23 20:59:03 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.214 2002/10/24 01:33:50 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -837,6 +837,12 @@ fi
837837

838838
AC_REPLACE_FUNCS([fseeko gethostname getrusage inet_aton random srandom strcasecmp strdup strerror strtol strtoul])
839839

840+
# BSD/OS has a custom fseeko/ftello built on fsetpos/fgetpos
841+
# We override the previous test that said fseeko/ftello didn't exist
842+
case $host_os in bsdi*)
843+
ac_cv_func_fseeko=yes
844+
esac
845+
840846
# Solaris has a very slow qsort in certain cases.
841847
case $host_os in
842848
solaris*) AC_LIBOBJ(qsort) ;;
@@ -903,12 +909,6 @@ AC_CHECK_FUNCS(atexit, [],
903909
[AC_CHECK_FUNCS(on_exit, [],
904910
[AC_MSG_ERROR([neither atexit() nor on_exit() found])])])
905911

906-
# BSD/OS has a custom fseeko/ftello built on fsetpos/fgetpos
907-
# We override the previous test that said fseeko/ftello didn't exist
908-
case $host_os in bsdi*)
909-
ac_cv_func_fseeko=yes
910-
esac
911-
912912
AC_FUNC_FSEEKO
913913

914914

‎src/bin/psql/common.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.49 2002/10/23 19:23:56 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.50 2002/10/24 01:33:50 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99

@@ -25,6 +25,17 @@
2525
#include <sys/timeb.h> /* for _ftime() */
2626
#endif
2727

28+
#ifndef WIN32
29+
#include <sys/ioctl.h> /* for ioctl() */
30+
#else
31+
#define popen(x,y) _popen(x,y)
32+
#define pclose(x) _pclose(x)
33+
#endif
34+
35+
#ifdef HAVE_TERMIOS_H
36+
#include <termios.h>
37+
#endif
38+
2839
#include "libpq-fe.h"
2940
#include "pqsignal.h"
3041

‎src/bin/psql/help.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.59 2002/10/23 19:23:56 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.60 2002/10/24 01:33:50 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "common.h"
@@ -14,7 +14,6 @@
1414
#include <errno.h>
1515

1616
#ifndef WIN32
17-
#include <sys/ioctl.h> /* for ioctl() */
1817
#ifdef HAVE_PWD_H
1918
#include <pwd.h> /* for getpwuid() */
2019
#endif

‎src/bin/psql/print.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,20 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.33 2002/10/23 19:23:57 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.34 2002/10/24 01:33:50 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "common.h"
1010
#include "print.h"
1111

1212
#include <math.h>
1313
#include <signal.h>
14-
#ifndef WIN32
15-
#include <unistd.h> /* for isatty() */
16-
#include <sys/ioctl.h> /* for ioctl() */
17-
#else
18-
#define popen(x,y) _popen(x,y)
19-
#define pclose(x) _pclose(x)
20-
#endif
2114

2215
#include "pqsignal.h"
2316
#include "libpq-fe.h"
2417

2518
#include "settings.h"
2619

27-
#ifdef HAVE_TERMIOS_H
28-
#include <termios.h>
29-
#endif
30-
3120
#include "mbprint.h"
3221

3322
/*************************/

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy