Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit dd10d0d

Browse files
committed
More chanes for bsdi_2_1 removal
1 parent fba75d0 commit dd10d0d

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

src/Makefile.global

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.47 1996/11/01 02:32:16 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.48 1996/11/01 03:32:57 momjian Exp $
1111
#
1212
# NOTES
1313
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -425,15 +425,15 @@ MK_PORT= bsdi
425425

426426
CC= gcc
427427

428-
PRE_BSDI_2_1=N
428+
PRE_BSDI_2_1= false
429429
ifeq ($(shell uname -r), 2.0)
430-
PRE_BSDI_2_1=Y
430+
PRE_BSDI_2_1= true
431431
endif
432432
ifeq ($(shell uname -r), 2.01)
433-
PRE_BSDI_2_1=Y
433+
PRE_BSDI_2_1= true
434434
endif
435435

436-
ifeq ($(PRE_BSDI_2_1), N)
436+
ifeq ($(PRE_BSDI_2_1), false)
437437
# cc is gcc v1.42
438438
# gcc is gcc v2.7.2
439439
LEX= lex

src/backend/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.12 1996/11/01 01:46:00 momjian Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.13 1996/11/01 03:35:43 momjian Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

@@ -64,7 +64,7 @@ LDADD+= -lln
6464
endif
6565

6666
ifeq ($(PORTNAME), bsdi)
67-
ifeq ($(PRE_BSDI_2_1), N)
67+
ifeq ($(PRE_BSDI_2_1), false)
6868
LDADD+= -ldl -lipc
6969
else
7070
LDADD+= -ldld -lipc

src/backend/port/bsdi/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for port/bsdi
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.2 1996/11/01 01:46:21 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/port/bsdi/Attic/Makefile,v 1.3 1996/11/01 03:35:54 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -17,7 +17,11 @@ INCLUDE_OPT = -I../.. \
1717

1818
CFLAGS+=$(INCLUDE_OPT)
1919

20+
ifeq ($(PRE_BSDI_2_1), false)
21+
OBJS = port.o
22+
else
2023
OBJS = dynloader.o port.o
24+
endif
2125

2226
all: SUBSYS.o
2327

src/include/storage/buf_internals.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: buf_internals.h,v 1.2 1996/10/31 09:49:42 scrappy Exp $
9+
* $Id: buf_internals.h,v 1.3 1996/11/01 03:36:13 momjian Exp $
1010
*
1111
* NOTE
1212
* If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -163,7 +163,6 @@ struct sbufdesc {
163163

164164
#if defined(PORTNAME_BSD44_derived) || \
165165
defined(PORTNAME_bsdi) || \
166-
defined(PORTNAME_bsdi_2_1) || \
167166
defined(PORTNAME_i386_solaris) || \
168167
defined(PORTNAME_linux) || \
169168
defined(PORTNAME_sparc) || \

src/include/storage/ipc.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: ipc.h,v 1.6 1996/10/31 09:49:48 scrappy Exp $
9+
* $Id: ipc.h,v 1.7 1996/11/01 03:36:16 momjian Exp $
1010
*
1111
* NOTES
1212
* This file is very architecture-specific. This stuff should actually
@@ -33,7 +33,6 @@
3333
defined(PORTNAME_alpha) || \
3434
defined(PORTNAME_BSD44_derived) || \
3535
defined(PORTNAME_bsdi) || \
36-
defined(PORTNAME_bsdi_2_1) || \
3736
defined(PORTNAME_hpux) || \
3837
defined(PORTNAME_i386_solaris) || \
3938
defined(PORTNAME_irix5) || \

0 commit comments

Comments
 (0)