From 9ef6b32c4711f16b93cd51ce4bcf48c06a53f729 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Wed, 17 Dec 1997 04:44:50 +0000
Subject: [PATCH] Makefile cleaned up
async.c: #include <port-protos.h> surrounded by an #ifdef HAVE_STRDUP
vacuum.c: #include <port-protos.h> commented out...can someone comment as
to why it was included, as it doesn't seem to have any effect
under FreeBSD so far...would like some sort of #ifdef wrapper
like async.c if possible
---
src/backend/commands/Makefile | 10 ++++++----
src/backend/commands/async.c | 6 ++++--
src/backend/commands/vacuum.c | 4 ++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index 9e57883deba..6b8e06d93c9 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -4,16 +4,18 @@
# Makefile for commands
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.8 1997/12/04 00:26:44 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.9 1997/12/17 04:44:47 scrappy Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../..
include ../../Makefile.global
-INCLUDE_OPT = -I.. \
- -I../port/$(PORTNAME) \
- -I../../include
+INCLUDE_OPT = -I..
+
+ifdef PORTNAME
+INCLUDE_OPT+=-I../port/$(PORTNAME)
+endif
CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 42a607051f3..0ce2d6403cf 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.25 1997/12/06 22:56:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.26 1997/12/17 04:44:49 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -82,7 +82,9 @@
#include <commands/async.h>
#include <libpq/libpq.h>
-#include <port-protos.h> /* for strdup() */
+#ifndef HAVE_STRDUP
+# include <port-protos.h> /* for strdup() */
+#endif
#include <storage/lmgr.h>
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 2de53600ceb..025c00ded6a 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.53 1997/11/25 21:59:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.54 1997/12/17 04:44:50 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -54,7 +54,7 @@
#include <sys/resource.h>
#endif
-#include <port-protos.h>
+/* #include <port-protos.h> */
extern int BlowawayRelationBuffers(Relation rdesc, BlockNumber block);
--
GitLab