summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Henderson1996-11-18 02:26:57 +0000
committerBryan Henderson1996-11-18 02:26:57 +0000
commite2a8163c405080552a52bc85a3024ad47ee9cf65 (patch)
tree894b7db24e5e7ca277f63dc924b4ac747fd8ee10
parentb55d49f5fe4446507f1b9fd5f78db005fc0f639c (diff)
Remove linux define of __USE_POSIX, which doesn't appear to do anything.
-rw-r--r--src/backend/tcop/Makefile17
-rw-r--r--src/backend/tcop/postgres.c10
2 files changed, 16 insertions, 11 deletions
diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile
index 719eaa2af2e..47bdd96909e 100644
--- a/src/backend/tcop/Makefile
+++ b/src/backend/tcop/Makefile
@@ -4,7 +4,7 @@
# Makefile for tcop
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.7 1996/11/14 07:33:34 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.8 1996/11/18 02:26:55 bryanh Exp $
#
#-------------------------------------------------------------------------
@@ -31,12 +31,23 @@ all: SUBSYS.o
SUBSYS.o: $(OBJS)
$(LD) -r -o SUBSYS.o $(OBJS)
-utility.o: ../parse.h
+# The following dependencies are picked up by the make dep, but since
+# not everyone can do make dep, and these are particularly important
+# dependencies (because they don't even exist until you make them),
+# they are hardcoded here.
+
+utility.o: ../parse.h ../fmgr.h
+aclchk.o: ../fmgr.h
+fastpath.o: ../fmgr.h
+postgres.o: ../fmgr.h
../parse.h:
$(MAKE) -C .. parse.h
-dep: ../parse.h
+../fmgr.h:
+ $(MAKE) -C .. fmgr.h
+
+dep: ../parse.h ../fmgr.h
$(CC) -MM $(INCLUDE_OPT) *.c >depend
clean:
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index b4970e27864..fa06c53b0c9 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.20 1996/11/16 09:03:44 bryanh Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.21 1996/11/18 02:26:57 bryanh Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -17,12 +17,6 @@
*/
#include "libpq/pqsignal.h" /* substitute for <signal.h> */
-#if defined(linux)
-#ifndef __USE_POSIX
-#define __USE_POSIX
-#endif
-#endif /* defined(linux) */
-
#include <unistd.h>
#include <stdio.h>
#include <string.h>
@@ -1268,7 +1262,7 @@ PostgresMain(int argc, char *argv[])
*/
if (IsUnderPostmaster == false) {
puts("\nPOSTGRES backend interactive interface");
- puts("$Revision: 1.20 $ $Date: 1996/11/16 09:03:44 $");
+ puts("$Revision: 1.21 $ $Date: 1996/11/18 02:26:57 $");
}
/* ----------------