aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/commands/vacuum.c4
-rw-r--r--src/backend/executor/execScan.c3
-rw-r--r--src/backend/executor/nodeHash.c4
-rw-r--r--src/backend/executor/nodeHashjoin.c4
-rw-r--r--src/backend/executor/nodeTee.c3
-rw-r--r--src/backend/libpq/pqcomm.c6
-rw-r--r--src/backend/storage/buffer/buf_init.c3
-rw-r--r--src/backend/storage/buffer/bufmgr.c3
-rw-r--r--src/backend/storage/buffer/localbuf.c3
-rw-r--r--src/backend/storage/file/fd.c4
-rw-r--r--src/backend/storage/large_object/inv_api.c4
-rw-r--r--src/backend/tcop/postgres.c7
-rw-r--r--src/backend/utils/Gen_fmgrtab.sh.in8
-rw-r--r--src/backend/utils/adt/float.c5
-rw-r--r--src/backend/utils/adt/misc.c3
-rw-r--r--src/backend/utils/cache/relcache.c3
16 files changed, 40 insertions, 27 deletions
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 867c4988b23..e74c5bc7aab 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,13 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.36 1997/06/07 17:34:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.37 1997/07/28 00:53:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <sys/file.h>
#include <string.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index 85ddda64710..8e69f491731 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -11,11 +11,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.2 1996/10/31 10:11:34 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execScan.c,v 1.3 1997/07/28 00:53:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <sys/file.h>
#include "postgres.h"
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index c71c3a3f440..c68052be2d2 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.8 1997/04/22 03:32:38 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.9 1997/07/28 00:53:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,11 +19,11 @@
*
*/
+#include <sys/types.h>
#include <stdio.h> /* for sprintf() */
#include <math.h>
#include <string.h>
#include <sys/file.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index e6eee333b87..55c77ef9d88 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,13 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.3 1996/11/06 06:47:41 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.4 1997/07/28 00:54:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <string.h>
#include <sys/file.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/src/backend/executor/nodeTee.c b/src/backend/executor/nodeTee.c
index 1ed017f5da7..6ddbecc3a49 100644
--- a/src/backend/executor/nodeTee.c
+++ b/src/backend/executor/nodeTee.c
@@ -15,11 +15,12 @@
* ExecEndTee
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.5 1996/11/10 03:00:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.6 1997/07/28 00:54:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <sys/file.h>
#include "postgres.h"
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index c0fa810e379..8ba16383c28 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.16 1997/04/17 20:38:16 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.17 1997/07/28 00:54:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -493,7 +493,9 @@ pq_regoob(void (*fptr)())
int fd = fileno(Pfout);
#if defined(hpux)
ioctl(fd, FIOSSAIOOWN, getpid());
-#else /* hpux */
+#elif defined(sco)
+ ioctl(fd, SIOCSPGRP, getpid());
+#else
fcntl(fd, F_SETOWN, getpid());
#endif /* hpux */
(void) pqsignal(SIGURG,fptr);
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 0a148ced4fd..20f8195d1e9 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -7,10 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.9 1997/04/18 02:53:15 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.10 1997/07/28 00:54:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
#include <math.h>
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 452aae878be..3210486e59a 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.14 1997/07/24 20:13:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.15 1997/07/28 00:54:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,6 +46,7 @@
* freelist.c -- chooses victim for buffer replacement
* buf_table.c -- manages the buffer lookup table
*/
+#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 0081b5fa1dd..910cb668d7a 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,10 +15,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.7 1997/05/20 11:30:32 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.8 1997/07/28 00:54:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <sys/file.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 34e8fe2a0e4..420606e6892 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Id: fd.c,v 1.18 1997/05/23 02:56:48 vadim Exp $
+ * $Id: fd.c,v 1.19 1997/07/28 00:54:52 momjian Exp $
*
* NOTES:
*
@@ -37,6 +37,7 @@
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <stdio.h>
#include <sys/file.h>
#include <sys/param.h>
@@ -44,7 +45,6 @@
#include <sys/stat.h>
#include <string.h>
#include <unistd.h>
-#include <sys/types.h>
#include <fcntl.h>
#include "postgres.h"
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index a258a270513..fa84d43db6f 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,14 +8,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.10 1997/06/05 22:59:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.11 1997/07/28 00:55:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <stdio.h> /* for sprintf() */
#include <string.h>
#include <sys/file.h>
-#include <sys/types.h>
#include <sys/stat.h>
#include "postgres.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 57262eada50..7b39d6915ca 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.34 1997/07/24 20:15:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.35 1997/07/28 00:55:28 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -29,6 +29,9 @@
#ifndef MAXHOSTNAMELEN
#include <netdb.h> /* for MAXHOSTNAMELEN on some */
#endif
+#ifndef MAXHOSTNAMELEN /* for MAXHOSTNAMELEN under sco3.2v5.0.2 */
+#include <sys/socket.h>
+#endif
#include <errno.h>
#ifdef aix
#include <sys/select.h>
@@ -1271,7 +1274,7 @@ PostgresMain(int argc, char *argv[])
*/
if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.34 $ $Date: 1997/07/24 20:15:03 $");
+ puts("$Revision: 1.35 $ $Date: 1997/07/28 00:55:28 $");
}
/* ----------------
diff --git a/src/backend/utils/Gen_fmgrtab.sh.in b/src/backend/utils/Gen_fmgrtab.sh.in
index 807862a127b..1d7c8d23568 100644
--- a/src/backend/utils/Gen_fmgrtab.sh.in
+++ b/src/backend/utils/Gen_fmgrtab.sh.in
@@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.3 1997/04/24 20:30:16 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.4 1997/07/28 00:55:41 momjian Exp $
#
# NOTES
# Passes any -D options on to cpp prior to generating the list
@@ -81,7 +81,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: Gen_fmgrtab.sh.in,v 1.3 1997/04/24 20:30:16 scrappy Exp $
+ * $Id: Gen_fmgrtab.sh.in,v 1.4 1997/07/28 00:55:41 momjian Exp $
*
* NOTES
* ******************************
@@ -152,7 +152,7 @@ extern void load_file(char *filename);
FuNkYfMgRsTuFf
awk '{ print $2, $1; }' $RAWFILE | \
-@TR@ '[a-z]' '[A-Z]' | \
+@TR@ @TRARGS@ | \
sed -e 's/^/#define F_/' >> $HFILE
cat >> $HFILE <<FuNkYfMgRsTuFf
@@ -175,7 +175,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.3 1997/04/24 20:30:16 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.4 1997/07/28 00:55:41 momjian Exp $
*
* NOTES
*
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index f5bbbd61c9e..3518fd7d4cc 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.16 1997/06/03 13:58:06 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.17 1997/07/28 00:55:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1446,7 +1446,8 @@ static int isinf(x)
}
#endif /* alpha */
-#if defined(sparc_solaris) || defined(i386_solaris) || defined(svr4)
+#if defined(sparc_solaris) || defined(i386_solaris) || defined(svr4) || \
+ defined(sco)
#include <ieeefp.h>
static int
isinf(d)
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index ced901f15c9..95dfcfc8ca1 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -7,10 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.6 1997/04/27 19:20:14 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.7 1997/07/28 00:55:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
+#include <sys/types.h>
#include <sys/file.h>
#include "postgres.h"
#include "utils/datum.h"
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 0e8bcf8be82..b124b6a160c 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.9 1997/06/04 08:56:51 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.10 1997/07/28 00:56:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,6 +29,7 @@
* careful....
*
*/
+#include <sys/types.h>
#include <stdio.h> /* for sprintf() */
#include <errno.h>
#include <sys/file.h>