aboutsummaryrefslogtreecommitdiff
path: root/src/backend/tcop/postgres.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2000-10-03 03:11:26 +0000
committerBruce Momjian <bruce@momjian.us>2000-10-03 03:11:26 +0000
commit87c0e623ba14c2de376ca9af06fb21da7b2c2215 (patch)
treee67887aaff9248f2e0c866566ed0b2967cabaae2 /src/backend/tcop/postgres.c
parentde1af06287dd0b169385b0756074a0b24feb123c (diff)
downloadpostgresql-87c0e623ba14c2de376ca9af06fb21da7b2c2215.tar.gz
postgresql-87c0e623ba14c2de376ca9af06fb21da7b2c2215.zip
New diff that now covers the entire tree. Applying this gets postgresql
working on the VERY latest version of BeOS. I'm sure there will be alot of comments, but then if there weren't I'd be disappointed! Thanks for your continuing efforts to get this into your tree. Haven't bothered with the new files as they haven't changed. BTW Peter, the compiler is "broken" about the bool define and so on. I'm filing a bug report to try and get it addressed. Hopefully then we can tidy up the code a bit. I await the replies with interest :) David Reid
Diffstat (limited to 'src/backend/tcop/postgres.c')
-rw-r--r--src/backend/tcop/postgres.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 150423faafa..bddad9e4f6e 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.176 2000/10/02 19:42:53 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.177 2000/10/03 03:11:19 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -1397,7 +1397,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[], const cha
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.176 $ $Date: 2000/10/02 19:42:53 $\n");
+ puts("$Revision: 1.177 $ $Date: 2000/10/03 03:11:19 $\n");
}
/*
@@ -1730,7 +1730,8 @@ ShowUsage(void)
(long int) user.tv_usec,
(long int) sys.tv_sec,
(long int) sys.tv_usec);
-#ifdef HAVE_GETRUSAGE
+/* BeOS has rusage but only has some fields, and not these... */
+#if defined(HAVE_GETRUSAGE) && !defined(__BEOS__)
fprintf(StatFp,
"!\t%ld/%ld [%ld/%ld] filesystem blocks in/out\n",
r.ru_inblock - Save_r.ru_inblock,