aboutsummaryrefslogtreecommitdiff
path: root/src/backend/bootstrap/bootstrap.c
diff options
context:
space:
mode:
authorMarc G. Fournier <scrappy@hub.org>1996-08-13 01:28:29 +0000
committerMarc G. Fournier <scrappy@hub.org>1996-08-13 01:28:29 +0000
commit9b7eb28ea5ebdea8ea92944f036b7c0409abd62f (patch)
treeeceb8d8746dca018611d7e92e12f5b67409bce39 /src/backend/bootstrap/bootstrap.c
parent5bd4485c8e4fd1a198af7bd7f254d5ea2330a886 (diff)
downloadpostgresql-9b7eb28ea5ebdea8ea92944f036b7c0409abd62f.tar.gz
postgresql-9b7eb28ea5ebdea8ea92944f036b7c0409abd62f.zip
Fixes:
There is a support routine in the standard 4.4BSD C library called "err()". There is also a utility routine in .../src/backend/bootstrap/bootstrap.c with the same name. Here's a patch that renames the pg95 routine to something a little more sane. As a bonus, one more bit of system-specific code leaves the system... Submitted by: "Kurt J. Lidl" <lidl@va.pubnix.com>
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
-rw-r--r--src/backend/bootstrap/bootstrap.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index d8dff690515..2a1832349ab 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.4 1996/07/23 02:23:05 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.5 1996/08/13 01:28:28 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -187,15 +187,11 @@ typedef void (*sig_func)();
* error handling / abort routines
* ----------------
*/
-# if !defined(PORTNAME_BSD44_derived) && \
- !defined(PORTNAME_bsdi) && \
- !defined(PORTNAME_bsdi_2_1)
-void err()
+void err_out()
{
Warnings++;
cleanup();
}
-#endif
/* usage:
usage help for the bootstrap backen